diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 12:52:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 12:53:02 +0100 |
| commit | d540e7577a4cfdb166d0287b619c30969ca749b4 (patch) | |
| tree | 0f0f668d2e9d0a156cbf7ac4a1b22bbd053ed9db /libavformat/rtmppkt.h | |
| parent | 774d0c9dbaf580df1570fb46caf5917e20ca5193 (diff) | |
| parent | 5b2ad78f97d43299adcb038c04346999fe9b196c (diff) | |
| download | ffmpeg-d540e7577a4cfdb166d0287b619c30969ca749b4.tar.gz | |
Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'
* commit '5b2ad78f97d43299adcb038c04346999fe9b196c':
rtmppkt: Handle extended timestamp field even for one-byte header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.h')
| -rw-r--r-- | libavformat/rtmppkt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmppkt.h b/libavformat/rtmppkt.h index fb79fedac6..741d8930df 100644 --- a/libavformat/rtmppkt.h +++ b/libavformat/rtmppkt.h @@ -78,7 +78,7 @@ typedef struct RTMPPacket { int channel_id; ///< RTMP channel ID (nothing to do with audio/video channels though) RTMPPacketType type; ///< packet payload type uint32_t timestamp; ///< packet full timestamp - uint32_t ts_delta; ///< timestamp increment to the previous one in milliseconds (latter only for media packets) + uint32_t ts_delta; ///< 24-bit timestamp or increment to the previous one, in milliseconds (latter only for media packets). Clipped to a maximum of 0xFFFFFF, indicating an extended timestamp field. uint32_t extra; ///< probably an additional channel ID used during streaming data uint8_t *data; ///< packet payload int size; ///< packet payload size |