diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:41:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:41:38 +0200 |
| commit | 97f856a4c27129f99f2c7a41f7eb33a0d86917f8 (patch) | |
| tree | 107580f4f54661dff94b093d196ab4b6efe715ba /libavcodec/options.c | |
| parent | 098a699867e061a0ab549ada6c62b35739e40f55 (diff) | |
| download | ffmpeg-97f856a4c27129f99f2c7a41f7eb33a0d86917f8.tar.gz | |
avcodec/options: avcodec_copy_context() Check subtitle_header_size instead of setting it
The value is already copied in the generic code so it should always match
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 88b3b12f33..b31483baa3 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -207,7 +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; + av_assert0(dest->subtitle_header_size == src->subtitle_header_size); #undef alloc_and_copy_or_fail return 0; |