[FFmpeg-cvslog] Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'
Michael Niedermayer
git at videolan.org
Wed May 29 03:16:50 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 02:59:04 2013 +0200| [28923f1923ba72804d55012a3b50a302a742f8f1] | committer: Michael Niedermayer
Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'
* commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71':
vc1dec: Redesign the intensity compensation
Conflicts:
libavcodec/vc1.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28923f1923ba72804d55012a3b50a302a742f8f1
---
More information about the ffmpeg-cvslog
mailing list