Michael Niedermayer 0a73803c86 Merge remote-tracking branch 'qatar/master' ...

* 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>

2013-04-23 11:01:46 +02:00

..

af_volume_init.c

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

2012-12-06 15:55:47 +01:00

af_volume.asm

Fix compilation with yasm 0.6.2.

2012-12-07 00:26:45 +01:00

Makefile

yadif: x86 assembly for 9 to 14-bit samples

2013-03-16 22:32:54 +01:00

vf_gradfun.c

Merge remote-tracking branch 'qatar/master'

2013-04-23 11:01:46 +02:00

vf_hqdn3d_init.c

avfilter/x86/vf_hqdn3d_init: fix author attribution & project name

2013-02-02 13:18:09 +01:00

vf_hqdn3d.asm

hqdn3d: Fix out of array read in LOWPASS

2013-03-13 09:14:59 +01:00

vf_yadif_init.c

Merge remote-tracking branch 'qatar/master'

2013-04-23 11:01:46 +02:00

vf_yadif.asm

yadif: remove an 'm' from the LOAD macro definition

2013-03-16 22:33:49 +01:00

yadif-10.asm

yadif: remove an 'm' from the LOAD macro definition

2013-03-16 22:33:49 +01:00

yadif-16.asm

yadif: remove an 'm' from the LOAD macro definition

2013-03-16 22:33:49 +01:00