Merge commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 23:13:19 +0000 (00:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 23:13:23 +0000 (00:13 +0100)
* commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159':
  rtpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpenc.h
libavformat/rtpenc_h264.c

Simple merge
Simple merge