Skip to content
Snippets Groups Projects
Commit e859339e authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '930e26a3' 


* commit '930e26a3':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f0615557 930e26a3
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment