apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-05-01 20:16:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  x86: Move some conditional code around to avoid unused variable warnings

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavfilter/x86/vf_yadif_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-04-23 11:01:46 +02:00
parent 5056cff125 c1ad70c3cb
commit 0a73803c86
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/x86/dsputilenc_mmx.c
+2 -1
View File
@@ -947,9 +947,10 @@ hadamard_func(ssse3)
av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx)
{
int mm_flags = av_get_cpu_flags();
int bit_depth = avctx->bits_per_raw_sample;
#if HAVE_YASM
int bit_depth = avctx->bits_per_raw_sample;
if (EXTERNAL_MMX(mm_flags)) {
if (bit_depth <= 8)
c->get_pixels = ff_get_pixels_mmx;