[FFmpeg-cvslog] Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'
Michael Niedermayer
git at videolan.org
Tue Sep 3 13:51:53 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 3 13:17:20 2013 +0200| [8ba683e629bd44f5c222ff8fe9cfdc101177dc0f] | committer: Michael Niedermayer
Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'
* commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30':
vcr1: add sanity checks
Conflicts:
libavcodec/vcr1.c
See: 845724c82c1a732ab398c9e8cedd178f96f1626d
See: 8e09482e4d27d65bbce2ce5c2f4392216011ed09
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ba683e629bd44f5c222ff8fe9cfdc101177dc0f
---
More information about the ffmpeg-cvslog
mailing list