Merge commit '98563953442560dd83aab938f86de3e5a22a891f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:48:00 +0000 (00:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:48:04 +0000 (00:48 +0100)
* commit '98563953442560dd83aab938f86de3e5a22a891f':
  rtpenc_aac: Fix sending fragmented frames

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

Simple merge