]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 18:16:19 +0000 (20:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 18:16:26 +0000 (20:16 +0200)
commitd602f16a377a84c5ba843c2d1ae03f8085ae758d
tree486f3f1dd94429bab4906341da3d7e2b8ad0d66d
parent67731ef40f9f86ca870ae4c5dbbe01ead8dba962
parentceb33f3aee157ea7d7be33c6df602e6be9d23536
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc: copy subtitle_header when copying context.
  lavf: data muxer and demuxer.

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