Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:16:39 +0000 (19:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:16:39 +0000 (19:16 +0200)
commitebb21887b853ffd2ae6eedddef39e13c91bc7956
tree95a94b931393cb99f27ecffddf14cd1012b0926f
parent865c94bb57dbb44b0855bba66cd4a11b28cc6ba2
parent01c5779f56cf708e6cb88b11cfdc248cae7e2ee8
Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
  x86: Drop some unnecessary YASM ifdefs

Conflicts:
libavfilter/x86/vf_yadif_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/h264chroma_init.c
libavcodec/x86/vorbisdsp_init.c
libavfilter/x86/vf_yadif_init.c
libavresample/x86/audio_mix_init.c