[FFmpeg-cvslog] Merge commit '715b8243460836fb7dd15bf7e41668e773beb276'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  1 15:14:31 2017 +0200| [a032c5224d409bf2d9d4f5dbcab9b8e9fae60b23] | committer: Clément Bœsch

Merge commit '715b8243460836fb7dd15bf7e41668e773beb276'

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

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a032c5224d409bf2d9d4f5dbcab9b8e9fae60b23
---

 libavcodec/qsv.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index dfc1536..1284419 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -466,9 +466,7 @@ static mfxStatus qsv_frame_lock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
     QSVMid *qsv_mid = mid;
     AVHWFramesContext *hw_frames_ctx = (AVHWFramesContext*)qsv_mid->hw_frames_ref->data;
     AVQSVFramesContext *hw_frames_hwctx = hw_frames_ctx->hwctx;
-    int size;
     int ret;
-    mfxStatus err;
 
     if (qsv_mid->locked_frame)
         return MFX_ERR_UNDEFINED_BEHAVIOR;
@@ -523,7 +521,6 @@ fail:
 static mfxStatus qsv_frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
 {
     QSVMid *qsv_mid = mid;
-    int ret;
 
     av_frame_free(&qsv_mid->locked_frame);
     av_frame_free(&qsv_mid->hw_frame);


======================================================================