Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Apr 2013 09:01:46 +0000 (11:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Apr 2013 09:01:46 +0000 (11:01 +0200)
commit0a73803c86f6f4e8db379d8514cccdd8a9d7b9ee
tree88c1e1cb1b855c90ec9b128e71ca2a62b80b3eb4
parent5056cff12597d57fe9a6bd327aee63de8b1f7ce3
parentc1ad70c3cb0588254d66265578cfb14580dc0b94
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>
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/mpegvideoenc.c
libavfilter/x86/vf_gradfun.c
libavfilter/x86/vf_yadif_init.c