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
..
2013-04-22 11:49:13 +00:00
2013-04-21 15:20:50 +02:00
2013-04-23 01:02:27 +02:00
2013-04-21 18:24:04 +02:00
2013-04-23 01:02:27 +02:00
2013-04-21 18:24:04 +02:00
2013-04-22 11:49:13 +00:00
2013-04-22 11:49:13 +00:00
2013-04-23 01:02:27 +02:00
2013-04-18 15:30:10 +00:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-15 16:23:28 +02:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-16 21:45:34 +00:00
2013-04-23 01:02:27 +02:00
2013-04-22 11:49:13 +00:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-23 01:02:27 +02:00
2013-04-17 22:39:44 +02:00