Commit e9314f19 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'dilaroga/master'

* dilaroga/master:
  vda: fix crash when a frame is dropped.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 889afca3 31a0ca9e
...@@ -41,6 +41,12 @@ ...@@ -41,6 +41,12 @@
#include "libavcodec/version.h" #include "libavcodec/version.h"
// extra flags not defined in VDADecoder.h
enum {
kVDADecodeInfo_Asynchronous = 1UL << 0,
kVDADecodeInfo_FrameDropped = 1UL << 1
};
/** /**
* @defgroup lavc_codec_hwaccel_vda VDA * @defgroup lavc_codec_hwaccel_vda VDA
* @ingroup lavc_codec_hwaccel * @ingroup lavc_codec_hwaccel
......
...@@ -41,6 +41,9 @@ static void vda_decoder_callback(void *vda_hw_ctx, ...@@ -41,6 +41,9 @@ static void vda_decoder_callback(void *vda_hw_ctx,
{ {
struct vda_context *vda_ctx = vda_hw_ctx; struct vda_context *vda_ctx = vda_hw_ctx;
if (infoFlags & kVDADecodeInfo_FrameDropped)
vda_ctx->cv_buffer = NULL;
if (!image_buffer) if (!image_buffer)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment