virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavc: properly handle subtitle_header in avcodec_copy_context()

Browse Source
This commit is contained in:
Anton Khirnov 2014-04-05 07:40:49 +02:00
parent efc7df6c1f
commit 3b2fbe67bd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/options.c
View File

@ -162,6 +162,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
dest->intra_matrix = NULL; dest->intra_matrix = NULL;
dest->inter_matrix = NULL; dest->inter_matrix = NULL;
dest->rc_override = NULL; dest->rc_override = NULL;
dest->subtitle_header = NULL;
if (src->rc_eq) { if (src->rc_eq) {
dest->rc_eq = av_strdup(src->rc_eq); dest->rc_eq = av_strdup(src->rc_eq);
if (!dest->rc_eq) if (!dest->rc_eq)
@ -182,6 +183,8 @@ 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(intra_matrix, 64 * sizeof(int16_t), 0);
alloc_and_copy_or_fail(inter_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(rc_override, src->rc_override_count * sizeof(*src->rc_override), 0);
alloc_and_copy_or_fail(subtitle_header, src->subtitle_header_size, 0);
dest->subtitle_header_size = src->subtitle_header_size;
#undef alloc_and_copy_or_fail #undef alloc_and_copy_or_fail
return 0; return 0;