Merge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Mar 2015 21:48:54 +0000 (22:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Mar 2015 21:48:54 +0000 (22:48 +0100)
* commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2':
  mjpeg: Mark decoder family as thread safe

Conflicts:
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mxpegdec.c
libavcodec/sp5xdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mxpegdec.c
libavcodec/sp5xdec.c

Simple merge
@@@ -166,5 -162,5 +167,6 @@@ AVCodec ff_mjpegb_decoder = 
      .close          = ff_mjpeg_decode_end,
      .decode         = mjpegb_decode_frame,
      .capabilities   = CODEC_CAP_DR1,
 +    .max_lowres     = 3,
+     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
  };
@@@ -2360,13 -1721,11 +2360,14 @@@ AVCodec ff_mjpeg_decoder = 
      .init           = ff_mjpeg_decode_init,
      .close          = ff_mjpeg_decode_end,
      .decode         = ff_mjpeg_decode_frame,
 +    .flush          = decode_flush,
      .capabilities   = CODEC_CAP_DR1,
 +    .max_lowres     = 3,
      .priv_class     = &mjpegdec_class,
+     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
  };
 -
 +#endif
 +#if CONFIG_THP_DECODER
  AVCodec ff_thp_decoder = {
      .name           = "thp",
      .long_name      = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"),
      .init           = ff_mjpeg_decode_init,
      .close          = ff_mjpeg_decode_end,
      .decode         = ff_mjpeg_decode_frame,
 +    .flush          = decode_flush,
      .capabilities   = CODEC_CAP_DR1,
 +    .max_lowres     = 3,
+     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
  };
 +#endif
@@@ -344,5 -346,5 +344,6 @@@ AVCodec ff_mxpeg_decoder = 
      .close          = mxpeg_decode_end,
      .decode         = mxpeg_decode_frame,
      .capabilities   = CODEC_CAP_DR1,
 +    .max_lowres     = 3,
+     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
  };
@@@ -104,10 -104,9 +105,11 @@@ AVCodec ff_sp5x_decoder = 
      .close          = ff_mjpeg_decode_end,
      .decode         = sp5x_decode_frame,
      .capabilities   = CODEC_CAP_DR1,
 +    .max_lowres     = 3,
+     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
  };
 -
 +#endif
 +#if CONFIG_AMV_DECODER
  AVCodec ff_amv_decoder = {
      .name           = "amv",
      .long_name      = NULL_IF_CONFIG_SMALL("AMV Video"),
      .init           = ff_mjpeg_decode_init,
      .close          = ff_mjpeg_decode_end,
      .decode         = sp5x_decode_frame,
 +    .max_lowres     = 3,
+     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
  };
 +#endif