diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 22:36:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 22:36:05 +0100 |
| commit | e859339e7af52210c6fe84a8e6412f0c30d1c4da (patch) | |
| tree | fdbafa085fef7b4de237574f072aca9fbefe6cc5 /libavutil/avstring.h | |
| parent | f0615557e03518b2fdc6d036ba29031a90646011 (diff) | |
| parent | 930e26a3ea9d223e04bac4cdde13697cec770031 (diff) | |
| download | ffmpeg-e859339e7af52210c6fe84a8e6412f0c30d1c4da.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavutil/avstring.h')
0 files changed, 0 insertions, 0 deletions