[FFmpeg-cvslog] Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102'
Michael Niedermayer
git at videolan.org
Mon Jan 13 14:24:33 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 13 14:18:03 2014 +0100| [58eb9b929998f415edf714fc7d8e3a1949d930f3] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58eb9b929998f415edf714fc7d8e3a1949d930f3
---
More information about the ffmpeg-cvslog
mailing list