Merge commit '7c1e2e64667421f931ab48141517f19d309c7eea'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:17:10 +0000 (01:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:17:10 +0000 (01:17 +0100)
commit7e5300958885e8d7e81e4e0183580558183a9a5e
tree728a4ef5bef3154b6457b1f9d41ff001c8259b69
parent41b8d154aa542f8b8cb02f0e7626081fa9ace9ec
parent7c1e2e64667421f931ab48141517f19d309c7eea
Merge commit '7c1e2e64667421f931ab48141517f19d309c7eea'

* commit '7c1e2e64667421f931ab48141517f19d309c7eea':
  rtpenc_xiph: Use AV_WB16 instead of manual bitshifts

Conflicts:
libavformat/rtpenc_xiph.c

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