2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	0ed023275f	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>	2012-10-05 17:04:15 +02:00
Diego Biurrun	1f6d86991f	x86: Add YASM implementations of cpuid and xgetbv from x264 ... This allows detecting CPU features with builds that have neither gcc inline assembly nor the right compiler intrinsics enabled.	2012-10-04 19:29:14 +02:00