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

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

Simple merge