ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Tue May 
19 21:22:59 2015 +0200| [95b42188d6197c951738c491d3fddebf134d7755] | committer: 
Michael Niedermayer

Merge commit '21b21aed797b5e636adcf2df811f96a95f208930' into release/2.4

* commit '21b21aed797b5e636adcf2df811f96a95f208930':
  nut: Check chapter creation in decode_info_header

Conflicts:
        libavformat/nutdec.c

See: 3ff1af2b0db7132d5717be6395227a94c8abab07
Merged-by: Michael Niedermayer <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95b42188d6197c951738c491d3fddebf134d7755
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to