diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 17:02:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 17:04:15 +0200 |
| commit | 0ed023275f79d6dd7b1be832da27175f788b8e4d (patch) | |
| tree | e8bea39cd11b75c5dfad3b39ba96169c6499a0ec /libavutil/x86/Makefile | |
| parent | 2a77d4f70b8b653ba405e6c01591bc402ab25a52 (diff) | |
| parent | f6f7d1504134683c435e2c7d804279d982e52bb4 (diff) | |
| download | ffmpeg-0ed023275f79d6dd7b1be832da27175f788b8e4d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: don't touch H264Context->ref_count[] during MB decoding
x86: get_cpu_flags: add necessary ifdefs around function body
x86: Drop CPU detection intrinsics
x86: Add YASM implementations of cpuid and xgetbv from x264
Conflicts:
configure
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/Makefile')
| -rw-r--r-- | libavutil/x86/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile index 4546353669..3dd696c26a 100644 --- a/libavutil/x86/Makefile +++ b/libavutil/x86/Makefile @@ -1,4 +1,5 @@ OBJS += x86/cpu.o \ x86/float_dsp_init.o \ -YASM-OBJS += x86/float_dsp.o \ +YASM-OBJS += x86/cpuid.o \ + x86/float_dsp.o \ |