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 | |
| 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')
| -rw-r--r-- | libavcodec/options.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index e1349dd3a8..fb803f3fd6 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -226,6 +226,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) alloc_and_copy_or_fail(intra_matrix, 64 * sizeof(int16_t), 0); alloc_and_copy_or_fail(inter_matrix, 64 * sizeof(int16_t), 0); alloc_and_copy_or_fail(rc_override, src->rc_override_count * sizeof(*src->rc_override), 0); + alloc_and_copy_or_fail(subtitle_header, src->subtitle_header_size, 1); #undef alloc_and_copy_or_fail return 0; |