]> git.sesse.net Git - ffmpeg/history - libavformat/concatdec.c
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
[ffmpeg] / libavformat / concatdec.c
2012-12-06 Michael NiedermayerMerge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
2012-12-06 Michael NiedermayerMerge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
2012-12-06 Michael NiedermayerMerge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'
2012-12-06 Nicolas Georgelavf: add a concat demuxer.