[FFmpeg-cvslog] Merge commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  1 01:08:00 2015 +0100| [41b8d154aa542f8b8cb02f0e7626081fa9ace9ec] | committer: Michael Niedermayer

Merge commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8'

* commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8':
  rtpenc_aac: Use AV_WB16 instead of manual bitshifts

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

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