diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 6c2e2f5b37..37846e3cea 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -116,6 +116,8 @@ int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p,
                 return AVERROR(EIO);
             timestamp = AV_RB32(buf);
         }
+        if (hdr != RTMP_PS_TWELVEBYTES)
+            timestamp += prev_pkt[channel_id].timestamp;
     }
     if (ff_rtmp_packet_create(p, channel_id, type, timestamp, data_size))
         return -1;
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 7b4f9eb7e7..8148fbff19 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -63,8 +63,6 @@ typedef struct RTMPContext {
     uint8_t*      flv_data;                   ///< buffer with data for demuxer
     int           flv_size;                   ///< current buffer size
     int           flv_off;                    ///< number of bytes read from current buffer
-    uint32_t      video_ts;                   ///< current video timestamp in milliseconds
-    uint32_t      audio_ts;                   ///< current audio timestamp in milliseconds
 } RTMPContext;
 
 #define PLAYER_KEY_OPEN_PART_LEN 30   ///< length of partial key used for first client digest signing
@@ -515,13 +513,6 @@ static int get_packet(URLContext *s, int for_header)
             uint8_t *p;
             uint32_t ts = rpkt.timestamp;
 
-            if (rpkt.type == RTMP_PT_VIDEO) {
-                rt->video_ts += rpkt.timestamp;
-                ts = rt->video_ts;
-            } else if (rpkt.type == RTMP_PT_AUDIO) {
-                rt->audio_ts += rpkt.timestamp;
-                ts = rt->audio_ts;
-            }
             // generate packet header and put data into buffer for FLV demuxer
             rt->flv_off  = 0;
             rt->flv_size = rpkt.data_size + 15;