Merge commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:08:00 +0000 (01:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:08:07 +0000 (01:08 +0100)
commit41b8d154aa542f8b8cb02f0e7626081fa9ace9ec
tree578cc6ce4e3e21fee0700556a3a945f2c0c78923
parent635403e078a017c7c9c633976a986573e09ee939
parentd16c8d28d4e2fca3af1054ffbf635c8cee755fc8
Merge commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8'

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

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