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)
commitfab8b88a5ebc0e05b0bf3d317439d9dcc676d8d1
tree18766512251c5c550fb129cb26313293621486af
parent17c52d746cad3c89f8d3eae38699019f2fbe9f65
parenta388e72d1a6b0888cc1591cb699f61a9c1089cf4
Merge commit 'a388e72d1a6b0888cc1591cb699f61a9c1089cf4'

* commit 'a388e72d1a6b0888cc1591cb699f61a9c1089cf4':
  rtpenc_hevc: Aggregate multiple NAL units into one RTP packet, if possible

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