ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Mar 10 
11:42:44 2015 +0100| [f8f324cc16c34d0204f2ce0d9eb20bac8b685a9c] | committer: 
Michael Niedermayer

Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'

* commit '448c8cfe4c53e9e806effd8505b46d57fa707061':
  movenc: Support setting fragment_index before the moov atom is written

Conflicts:
        libavformat/movenc.c

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

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



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

Reply via email to