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

Conflicts:
libavformat/rtpenc_xiph.c

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

@@@ -19,7 -19,8 +19,9 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 +#include "libavutil/avassert.h"
+ #include "libavutil/intreadwrite.h"
  #include "avformat.h"
  #include "rtpenc.h"