generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'dilaroga/master'

Browse Source 
* dilaroga/master:
  vda: fix crash when a frame is dropped.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-03 15:33:56 +01:00
parent 889afca369 31a0ca9e75
commit e9314f1968
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vda.h
View File

@@ -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

3
libavcodec/vda_h264.c
View File

@@ -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;