Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 17:39:06 +0000 (19:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 17:39:06 +0000 (19:39 +0200)
* commit '3b2fbe67bd63b00331db2a9b213f6d420418a312':
  lavc: properly handle subtitle_header in avcodec_copy_context()

Conflicts:
libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/options.c

@@@ -205,7 -183,8 +206,8 @@@ int avcodec_copy_context(AVCodecContex
      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(rc_override,  src->rc_override_count * sizeof(*src->rc_override), 0);
 -    alloc_and_copy_or_fail(subtitle_header, src->subtitle_header_size, 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;