]> git.sesse.net Git - ffmpeg/commit
Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Jan 2014 13:18:03 +0000 (14:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Jan 2014 13:19:15 +0000 (14:19 +0100)
commit58eb9b929998f415edf714fc7d8e3a1949d930f3
tree4a01c70120f984ea0ad28e32d06bd43a39eb522f
parent1df53ff22de2732596571ea98b8bad1c6dd42543
parent6d98959c8a5a749592a878b9523b31eccea5d102
Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102'

* commit '6d98959c8a5a749592a878b9523b31eccea5d102':
  vc1: Add avg_no_rnd_vc1_chroma_mc4_c()

Conflicts:
libavcodec/vc1dsp.c

See: dd6e291e4083b7af53968c0ae06330841f63405b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1dsp.c