[FFmpeg-cvslog] Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'
Michael Niedermayer
git at videolan.org
Sun May 10 22:17:10 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 10 22:09:26 2015 +0200| [8b0ceb96da0e615e6c7e6ed11da5035c0506dadb] | committer: Michael Niedermayer
Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'
* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
nut: Check chapter creation in decode_info_header
Conflicts:
libavformat/nutdec.c
See: 3ff1af2b0db7132d5717be6395227a94c8abab07
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b0ceb96da0e615e6c7e6ed11da5035c0506dadb
---
More information about the ffmpeg-cvslog
mailing list