diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 14:09:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 14:09:35 +0100 |
| commit | 4fc339faea114873125b2bef1a8412059ab0e850 (patch) | |
| tree | f0a1e95a4e82010f0bac4d7725214c3406d560ec /libavformat/rtmppkt.h | |
| parent | 9baef60ae4004c06e839cf1d4d6a5b225bb7d5d1 (diff) | |
| parent | 77eed91fab9b29426722f424fc39c109a8fa5b11 (diff) | |
| download | ffmpeg-4fc339faea114873125b2bef1a8412059ab0e850.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmppkt: Rename the ts_delta field to ts_field
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 741d8930df..0d98f60981 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; ///< 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 ts_field; ///< 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 |