[FFmpeg-cvslog] Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'
Michael Niedermayer
git at videolan.org
Wed Oct 8 22:05:43 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 8 21:58:42 2014 +0200| [d5a3caef93026abebaa73f4b9c747004a1457fd7] | committer: Michael Niedermayer
Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'
* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576':
vc1: Split the decoder in components
Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5a3caef93026abebaa73f4b9c747004a1457fd7
---
More information about the ffmpeg-cvslog
mailing list