diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 02:04:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 02:17:02 +0100 |
| commit | 7b29b07394c6d5741f1419c0b8007cc9f7308359 (patch) | |
| tree | ad2a6f8e54a1a43506edf4e19bf22e1c2b14412f /ffmpeg.h | |
| parent | 7d2156aee8b6909f71940e7f1c1e9e7062b5cf40 (diff) | |
| parent | e96d90eed66a198566c409958432d282e1b03869 (diff) | |
| download | ffmpeg-7b29b07394c6d5741f1419c0b8007cc9f7308359.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
remove #defines to prevent use of discouraged external functions
x86: h264: Convert 8-bit QPEL inline assembly to YASM
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions