[FFmpeg-cvslog] Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'
Michael Niedermayer
git at videolan.org
Mon Sep 23 14:09:12 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 23 14:03:53 2013 +0200| [c74fa39b93eda712f4ec648d9099623cbe4095ee] | committer: Michael Niedermayer
Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'
* commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd':
vc1dec: Don't decode slices when the latest slice header failed to decode
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c74fa39b93eda712f4ec648d9099623cbe4095ee
---
More information about the ffmpeg-cvslog
mailing list