diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-10 12:44:27 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-10 12:44:39 +0100 |
commit | 2ce64413e2b7f60041ff3e929e58242004c7921d (patch) | |
tree | 3c79e169c5da7940c94eb61658a6e69e3f221795 /libavformat/sauce.c | |
parent | b56ff0b261c4432e52e6b66bbd515f5694292b8a (diff) | |
parent | 4b60fac4199680957b15b7a08c5df47e47c6e25e (diff) | |
download | ffmpeg-2ce64413e2b7f60041ff3e929e58242004c7921d.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: PALIGNR: port to cpuflags
x86: h264_qpel_10bit: port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sauce.c')
0 files changed, 0 insertions, 0 deletions