mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
* commit '6d98959c8a5a749592a878b9523b31eccea5d102': vc1: Add avg_no_rnd_vc1_chroma_mc4_c() Conflicts: libavcodec/vc1dsp.c See: dd6e291e4083b7af53968c0ae06330841f63405b Merged-by: Michael Niedermayer <michaelni@gmx.at>