RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312' 

* commit '3b2fbe67bd63b00331db2a9b213f6d420418a312':
  lavc: properly handle subtitle_header in avcodec_copy_context()

Conflicts:
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-15 19:39:06 +02:00
parent 9b7cb02319 3b2fbe67bd
commit 098a699867
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/options.c
View File

@ -185,6 +185,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)
@ -206,6 +207,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
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, 1); alloc_and_copy_or_fail(subtitle_header, src->subtitle_header_size, 1);
dest->subtitle_header_size = src->subtitle_header_size;
#undef alloc_and_copy_or_fail #undef alloc_and_copy_or_fail
return 0; return 0;