Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 12:35:49 +0000 (13:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 12:35:49 +0000 (13:35 +0100)
commit60a0bc46cdba5f13d557624d3448628328ad0fb0
tree65788b23d15f155b742e5fd6d85e10c601f1d772
parentc4e394e46008c9e208f666d156f49f7ba500d73a
parenta846dccb29d2bb0798af1d47d06100eda9ca87cc
Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'

* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
  h264chroma: x86: Fix building with yasm disabled
  rv34: Drop now unnecessary dsputil dependencies

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/rv34dsp_init_arm.c
libavcodec/arm/rv40dsp_init_arm.c
libavcodec/rv30dsp.c
libavcodec/rv34.c
libavcodec/rv40dsp.c
libavcodec/x86/Makefile
libavcodec/x86/h264chroma_init.c
libavcodec/x86/rv40dsp_init.c