[FFmpeg-cvslog] Merge commit '9c9b0218e85fcd969308632f75af48a4ce229541'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  1 01:07:42 2015 +0100| [635403e078a017c7c9c633976a986573e09ee939] | committer: Michael Niedermayer

Merge commit '9c9b0218e85fcd969308632f75af48a4ce229541'

* commit '9c9b0218e85fcd969308632f75af48a4ce229541':
  rtpenc_aac: Merge a definition with a declaration

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=635403e078a017c7c9c633976a986573e09ee939
---