[FFmpeg-cvslog] lavc: copy subtitle_header when copying context.

Nicolas George git at videolan.org
Wed May 1 20:22:36 CEST 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Apr 23 20:18:00 2013 +0200| [ceb33f3aee157ea7d7be33c6df602e6be9d23536] | committer: Nicolas George

lavc: copy subtitle_header when copying context.

Fix trac ticket #2489.

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

 libavcodec/options.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/options.c b/libavcodec/options.c
index e1349dd..fb803f3 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;



More information about the ffmpeg-cvslog mailing list