ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Oct 13 
01:10:13 2014 +0200| [20a66868a25bf7719e73ba7c6bbbe59a0f7f77b7] | committer: 
Michael Niedermayer

Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'

* commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e':
  movenc: Print a warning for an unhandled case of nonzero start dts with 
empty_moov

Conflicts:
        libavformat/movenc.c

Merged-by: Michael Niedermayer <michae...@gmx.at>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to