diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 00:13:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 00:13:23 +0100 |
commit | 17c52d746cad3c89f8d3eae38699019f2fbe9f65 (patch) | |
tree | 4c3473fb1eca4e169f9de1f955de1a47a8a0d2f2 /libavformat/rtpenc.h | |
parent | db4a2976f6afb6ac16bdd455695dcc277a03416d (diff) | |
parent | e2220e734f3d01145ef9aefbd7b6ff29a89ae159 (diff) | |
download | ffmpeg-streaming-17c52d746cad3c89f8d3eae38699019f2fbe9f65.zip ffmpeg-streaming-17c52d746cad3c89f8d3eae38699019f2fbe9f65.tar.gz |
Merge commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159'
* commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159':
rtpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.h')
-rw-r--r-- | libavformat/rtpenc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index 4eb98d8..21e7f26 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -56,6 +56,7 @@ struct RTPMuxContext { * (1, 2 or 4) */ int nal_length_size; + int buffered_nals; int flags; |