diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 00:43:45 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 00:43:45 +0100 |
commit | bf2f93cdbf15c96c62b5112c1ab7f8093177e508 (patch) | |
tree | 02992eb3142695332689898d713bef0653f3aa32 /libavcodec/x86/dsputil_mmx.c | |
parent | b473c9937ebe9aafef9d2e07f080fb12ecc53ef4 (diff) | |
parent | 28c8e288fa0342fdef532a7522a4707bebf831cc (diff) | |
download | ffmpeg-bf2f93cdbf15c96c62b5112c1ab7f8093177e508.tar.gz |
Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
x86: h264_chromamc: port to cpuflags
yop: fix typo
avconv: fix copying per-stream metadata.
doc: avtools-common-opts: Fix terminology concerning metric prefixes
configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
riff: Make ff_riff_tags static and move under appropriate #ifdef
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.c')
0 files changed, 0 insertions, 0 deletions