diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-19 04:02:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-19 04:02:06 +0200 |
| commit | 83f9bc8aeece0d7c5b1fadaf91118ee6a97a0390 (patch) | |
| tree | 187761ffb28af7cd5ee857fa919f0d1244ffdbcf /libavcodec/x86/Makefile | |
| parent | 15b4f6449ddb1f52ae82dee3f94a5b56b636cbea (diff) | |
| parent | dbafb0e06faa092f60e53d845957fbab7f2a3f2d (diff) | |
| download | ffmpeg-streaming-83f9bc8aeece0d7c5b1fadaf91118ee6a97a0390.zip ffmpeg-streaming-83f9bc8aeece0d7c5b1fadaf91118ee6a97a0390.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: prevent crash in av_open_input_file() if ap == NULL.
more Changelog additions
lavf: add a forgotten NULL check in convert_format_parameters().
Fix build if yasm is not available.
H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions.
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/Makefile')
| -rw-r--r-- | libavcodec/x86/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 9ea330c..de57b58 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -45,6 +45,7 @@ MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \ x86/deinterlace.o \ x86/fmtconvert.o \ x86/h264_chromamc.o \ + x86/h264_chromamc_10bit.o \ $(YASM-OBJS-yes) MMX-OBJS-$(CONFIG_FFT) += x86/fft.o |
