Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 16:58:01 +0000 (18:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 16:58:01 +0000 (18:58 +0200)
* commit '007e27d363ba7d994019dc897dc9c39071bb204a':
  avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()

Conflicts:
libavcodec/atrac3plusdec.c
libavcodec/sp5xdec.c

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

@@@ -388,12 -383,14 +388,13 @@@ static int atrac3p_decode_frame(AVCodec
  }
  
  AVCodec ff_atrac3p_decoder = {
 -    .name             = "atrac3plus",
 -    .long_name        = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"),
 -    .type             = AVMEDIA_TYPE_AUDIO,
 -    .id               = AV_CODEC_ID_ATRAC3P,
 -    .capabilities     = CODEC_CAP_DR1,
 -    .priv_data_size   = sizeof(ATRAC3PContext),
 -    .init             = atrac3p_decode_init,
 -    .init_static_data = ff_atrac3p_init_vlcs,
 -    .close            = atrac3p_decode_close,
 -    .decode           = atrac3p_decode_frame,
 +    .name           = "atrac3plus",
 +    .long_name      = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"),
 +    .type           = AVMEDIA_TYPE_AUDIO,
 +    .id             = AV_CODEC_ID_ATRAC3P,
++    .capabilities   = CODEC_CAP_DR1,
 +    .priv_data_size = sizeof(ATRAC3PContext),
 +    .init           = atrac3p_decode_init,
 +    .close          = atrac3p_decode_close,
 +    .decode         = atrac3p_decode_frame,
  };
Simple merge
@@@ -119,7 -116,6 +119,8 @@@ AVCodec ff_amv_decoder = 
      .init           = ff_mjpeg_decode_init,
      .close          = ff_mjpeg_decode_end,
      .decode         = sp5x_decode_frame,
 +    .max_lowres     = 3,
+     .capabilities   = CODEC_CAP_DR1,
      .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
  };
 +#endif