[FFmpeg-cvslog] avcodec/qsvenc_h264: declare the QSVEncContext variable before using it

James Almer git at videolan.org
Sun Jun 19 17:06:05 CEST 2016


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Jun 19 12:04:03 2016 -0300| [5f5a97dc3d291d2dba63b8cbefd4d6e8b3a9db16] | committer: James Almer

avcodec/qsvenc_h264: declare the QSVEncContext variable before using it

Should fix compilation.

Regression introduced by commit 63adb3602d3b35c5d1df14cf1e477bc458f96b7b

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavcodec/qsvenc_h264.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index cd08d86..3fb5ca3 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -43,10 +43,10 @@ typedef struct QSVH264EncContext {
 static int qsv_h264_set_encode_ctrl(AVCodecContext *avctx,
                                     const AVFrame *frame, mfxEncodeCtrl* enc_ctrl)
 {
+    QSVH264EncContext *qh264 = avctx->priv_data;
+    QSVEncContext *q = &qh264->qsv;
+
     if (q->a53_cc && frame) {
-        AVFrameSideData *side_data = NULL;
-        QSVH264EncContext *qh264 = avctx->priv_data;
-        QSVEncContext *q = &qh264->qsv;
         mfxPayload* payload;
         mfxU8* sei_data;
         size_t sei_size;



More information about the ffmpeg-cvslog mailing list