Merge commit '977105407cae55876041dddbf4ce0934cdd4cd6c'
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 21 Jul 2015 18:20:25 +0000 (20:20 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 21 Jul 2015 18:21:54 +0000 (20:21 +0200)
* commit '977105407cae55876041dddbf4ce0934cdd4cd6c':
  hap: Decode using optimal slices sizes

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavcodec/hap.h
libavcodec/hapdec.c

Simple merge
@@@ -165,11 -194,10 +182,11 @@@ static int hap_decode(AVCodecContext *a
      ret = ff_thread_get_buffer(avctx, &tframe, 0);
      if (ret < 0)
          return ret;
 -    ff_thread_finish_setup(avctx);
 +    if (avctx->codec->update_thread_context)
 +        ff_thread_finish_setup(avctx);
  
      /* Use the decompress function on the texture, one block per thread */
-     avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, blocks);
+     avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, slices);
  
      /* Frame is ready to be output */
      tframe.f->pict_type = AV_PICTURE_TYPE_I;