diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:39:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:39:06 +0200 |
| commit | 098a699867e061a0ab549ada6c62b35739e40f55 (patch) | |
| tree | 520b4ea1d587a7ff20df319c8e7bdd1abdf8aad4 /libavcodec | |
| parent | 9b7cb02319b65596b5ef106a830fd813248fb580 (diff) | |
| parent | 3b2fbe67bd63b00331db2a9b213f6d420418a312 (diff) | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 204c12a3f2..88b3b12f33 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -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; |