ffmpeg git master compile error on qsvenc_h264.c

[bermond]

I'm getting the following compile error on qsvenc_h264.c when trying to compile ffmpeg git master on linux x86_64:

CC      libavcodec/qsvenc_h264.o
libavcodec/qsvenc_h264.c: In function ‘qsv_h264_set_encode_ctrl’:
libavcodec/qsvenc_h264.c:46:9: error: ‘q’ undeclared (first use in this function)
     if (q->a53_cc && frame) {
         ^
libavcodec/qsvenc_h264.c:46:9: note: each undeclared identifier is reported only once for each function it appears in
libavcodec/qsvenc_h264.c:49:24: warning: unused variable ‘q’ [-Wunused-variable]
         QSVEncContext *q = &qh264->qsv;
                        ^
libavcodec/qsvenc_h264.c:47:26: warning: unused variable ‘side_data’ [-Wunused-variable]
         AVFrameSideData *side_data = NULL;
                          ^~~~~~~~~
make: *** [common.mak:60: libavcodec/qsvenc_h264.o] Error 1

I can confirm that ffmpeg git master was compiling perfectly until commit ​0fcc252 and started to give this error after the introduction of a bunch of H.264 commits that followed that one.

Tried to use libmfx from lu-zero and from Intel Media SDK. Both give the same error.
Using GCC version 6.1.1.

How to reproduce (using libmfx from lu-zero):

$ git clone git://source.ffmpeg.org/ffmpeg.git ffmpeg-full-git
$ cd ffmpeg-full-git
$ ./configure --prefix="/usr" --enable-libmfx
$ make

How to reproduce (using libmfx from Intel Media SDK):

$ git clone git://source.ffmpeg.org/ffmpeg.git ffmpeg-full-git
$ cd ffmpeg-full-git
$ ./configure --extra-cflags="-I/opt/intel/mediasdk/include" --extra-ldflags="-L/opt/intel/mediasdk/lib/lin_x64" --pkgconfigdir="/opt/intel/mediasdk/lib/pkgconfig" --prefix="/usr" --enable-libmfx
$ make

Thank you.

[James]

Should be fixed in 5f5a97dc3d291d2dba63b8cbefd4d6e8b3a9db16.

Please reopen the ticket if not.

[bermond]

Replying to jamrial:

Should be fixed in 5f5a97dc3d291d2dba63b8cbefd4d6e8b3a9db16.

Please reopen the ticket if not.

I can confirm that this commit fixed compilation.
Thank you for the support!