har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '715b8243460836fb7dd15bf7e41668e773beb276'

Browse Source 
* commit '715b8243460836fb7dd15bf7e41668e773beb276':
  qsv: Drop some unused variables

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-04-01 15:14:31 +02:00
commit a032c5224d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/qsv.c
View File

@ -466,9 +466,7 @@ static mfxStatus qsv_frame_lock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
QSVMid *qsv_mid = mid; QSVMid *qsv_mid = mid;
AVHWFramesContext *hw_frames_ctx = (AVHWFramesContext*)qsv_mid->hw_frames_ref->data; AVHWFramesContext *hw_frames_ctx = (AVHWFramesContext*)qsv_mid->hw_frames_ref->data;
AVQSVFramesContext *hw_frames_hwctx = hw_frames_ctx->hwctx; AVQSVFramesContext *hw_frames_hwctx = hw_frames_ctx->hwctx;
int size;
int ret; int ret;
mfxStatus err;
if (qsv_mid->locked_frame) if (qsv_mid->locked_frame)
return MFX_ERR_UNDEFINED_BEHAVIOR; return MFX_ERR_UNDEFINED_BEHAVIOR;
@ -523,7 +521,6 @@ fail:
static mfxStatus qsv_frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr) static mfxStatus qsv_frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
{ {
QSVMid *qsv_mid = mid; QSVMid *qsv_mid = mid;
int ret;
av_frame_free(&qsv_mid->locked_frame); av_frame_free(&qsv_mid->locked_frame);
av_frame_free(&qsv_mid->hw_frame); av_frame_free(&qsv_mid->hw_frame);