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)
* commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8':
  rtpenc_aac: Use AV_WB16 instead of manual bitshifts

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

Simple merge