Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Nov 2012 21:36:05 +0000 (22:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Nov 2012 21:36:05 +0000 (22:36 +0100)
* commit '930e26a3ea9d223e04bac4cdde13697cec770031':
  x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled
  x86: PABSW: port to cpuflags
  x86: vc1dsp: port to cpuflags
  rtmp: Use av_strlcat instead of strncat

Conflicts:
libavcodec/x86/h264_qpel.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/h264_qpel.c
libavcodec/x86/vc1dsp.asm
libavutil/x86/x86util.asm

Simple merge
Simple merge
Simple merge