Merge commit '6d98959c'
* commit '6d98959c': vc1: Add avg_no_rnd_vc1_chroma_mc4_c() Conflicts: libavcodec/vc1dsp.c See: dd6e291eMerged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '6d98959c': vc1: Add avg_no_rnd_vc1_chroma_mc4_c() Conflicts: libavcodec/vc1dsp.c See: dd6e291eMerged-by:Michael Niedermayer <michaelni@gmx.at>