diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 20:16:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 20:16:26 +0200 |
| commit | d602f16a377a84c5ba843c2d1ae03f8085ae758d (patch) | |
| tree | 486f3f1dd94429bab4906341da3d7e2b8ad0d66d /libavcodec/proresenc_anatoliy.c | |
| parent | 67731ef40f9f86ca870ae4c5dbbe01ead8dba962 (diff) | |
| parent | ceb33f3aee157ea7d7be33c6df602e6be9d23536 (diff) | |
| download | ffmpeg-d602f16a377a84c5ba843c2d1ae03f8085ae758d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/proresenc_anatoliy.c')
0 files changed, 0 insertions, 0 deletions