diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:11:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:11:40 +0200 |
| commit | 06186a3160d031b80c8772a646ab98c27b78d011 (patch) | |
| tree | 1b6f274f2a7fcf782ecdf1cde93462ddbb3295cb /libavformat/rtmppkt.h | |
| parent | a2b0699f4f0a9b16382fb66616cd009f7ba6552f (diff) | |
| parent | ba5393a609c723ec8ab7f9727c10fef734c09278 (diff) | |
| download | ffmpeg-06186a3160d031b80c8772a646ab98c27b78d011.tar.gz | |
Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'
* commit 'ba5393a609c723ec8ab7f9727c10fef734c09278':
rtmp: rename data_size to size
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 2740231c6d..ee8763be97 100644 --- a/libavformat/rtmppkt.h +++ b/libavformat/rtmppkt.h @@ -81,7 +81,7 @@ typedef struct RTMPPacket { uint32_t ts_delta; ///< timestamp increment to the previous one in milliseconds (latter only for media packets) uint32_t extra; ///< probably an additional channel ID used during streaming data uint8_t *data; ///< packet payload - int data_size; ///< packet payload size + int size; ///< packet payload size } RTMPPacket; /** |