mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-18 15:25:05 +02:00
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:
commit
098a699867
@ -185,6 +185,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
|
||||
dest->intra_matrix = NULL;
|
||||
dest->inter_matrix = NULL;
|
||||
dest->rc_override = NULL;
|
||||
dest->subtitle_header = NULL;
|
||||
if (src->rc_eq) {
|
||||
dest->rc_eq = av_strdup(src->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(rc_override, src->rc_override_count * sizeof(*src->rc_override), 0);
|
||||
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
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user