Merge commit '4ff670d99bebd97429322719089363d83143477d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Nov 2014 01:10:29 +0000 (02:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Nov 2014 01:10:46 +0000 (02:10 +0100)
* commit '4ff670d99bebd97429322719089363d83143477d':
  hwaccel: Deinitialize hardware acceleration early enough

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

@@@ -1218,15 -961,8 +1223,10 @@@ int ff_get_format(AVCodecContext *avctx
              break;
          }
  
-         if (avctx->hwaccel && avctx->hwaccel->uninit)
-             avctx->hwaccel->uninit(avctx);
-         av_freep(&avctx->internal->hwaccel_priv_data);
-         avctx->hwaccel = NULL;
          if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL))
              break;
 +        if (avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
 +            break;
  
          if (!setup_hwaccel(avctx, ret, desc->name))
              break;