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)
commit17c52d746cad3c89f8d3eae38699019f2fbe9f65
tree4c3473fb1eca4e169f9de1f955de1a47a8a0d2f2
parentdb4a2976f6afb6ac16bdd455695dcc277a03416d
parente2220e734f3d01145ef9aefbd7b6ff29a89ae159
Merge commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159'

* commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159':
  rtpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible

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