Merge commit '9c9b0218e85fcd969308632f75af48a4ce229541'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:07:42 +0000 (01:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:07:46 +0000 (01:07 +0100)
* commit '9c9b0218e85fcd969308632f75af48a4ce229541':
  rtpenc_aac: Merge a definition with a declaration

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

Simple merge