[FFmpeg-cvslog] Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  5 22:36:05 2012 +0100| [e859339e7af52210c6fe84a8e6412f0c30d1c4da] | committer: Michael Niedermayer

Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e859339e7af52210c6fe84a8e6412f0c30d1c4da
---