08:48 jbeich 

x11-toolkits/nucleo: unbreak build with ffmpeg 3.x

In file included from nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:14:
nucleo/plugins/ffmpeg/ffmpegImageSink.H:39:10: error: ISO C++ forbids forward
references to
      'enum' types
    enum PixelFormat srcEncoding ;
         ^
nucleo/plugins/ffmpeg/ffmpegImageSink.H:39:22: error: field has incomplete type
      'enum PixelFormat'
    enum PixelFormat srcEncoding ;
                     ^
nucleo/plugins/ffmpeg/ffmpegImageSink.H:39:10: note: forward declaration of
      'nucleo::PixelFormat'
    enum PixelFormat srcEncoding ;
         ^
nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:131:44: error: use of undeclared
identifier 'CODEC_ID_NONE'; did you mean
      'AV_CODEC_ID_NONE'?
    else if (output_format->video_codec == CODEC_ID_NONE) {
                                           ^~~~~~~~~~~~~
                                           AV_CODEC_ID_NONE
/usr/local/include/libavcodec/avcodec.h:192:5: note: 'AV_CODEC_ID_NONE' declared
here
    AV_CODEC_ID_NONE,
    ^
nucleo/plugins/ffmpeg/ffmpegImageSource.cxx:132:8: error: use of undeclared
identifier 'PIX_FMT_GRAY8'; did you mean
      'AV_PIX_FMT_GRAY8'?
         case PIX_FMT_GRAY8:
              ^~~~~~~~~~~~~
              AV_PIX_FMT_GRAY8
/usr/local/include/libavutil/pixfmt.h:70:5: note: 'AV_PIX_FMT_GRAY8' declared
here
    AV_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
    ^
nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:265:34: error: use of undeclared
identifier 'PIX_FMT_GRAY8'; did you mean
      'AV_PIX_FMT_GRAY8'?
    case Image::L: srcEncoding = PIX_FMT_GRAY8 ; break ;
                                 ^~~~~~~~~~~~~
                                 AV_PIX_FMT_GRAY8
/usr/local/include/libavutil/pixfmt.h:70:5: note: 'AV_PIX_FMT_GRAY8' declared
here
    AV_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
    ^
nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:266:42: error: use of undeclared
identifier 'PIX_FMT_YUV420P'; did you mean
      'AV_PIX_FMT_YUV420P'?
    case Image::YpCbCr420: srcEncoding = PIX_FMT_YUV420P ; break ;
                                         ^~~~~~~~~~~~~~~
                                         AV_PIX_FMT_YUV420P
/usr/local/include/libavutil/pixfmt.h:62:5: note: 'AV_PIX_FMT_YUV420P' declared
here
    AV_PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per
2x2 Y samples)
    ^
nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:267:28: error: use of undeclared
identifier 'PIX_FMT_RGB24'; did you mean
      'AV_PIX_FMT_RGB24'?
    default: srcEncoding = PIX_FMT_RGB24 ; break ;
                           ^~~~~~~~~~~~~
                           AV_PIX_FMT_RGB24
/usr/local/include/libavutil/pixfmt.h:64:5: note: 'AV_PIX_FMT_RGB24' declared
here
    AV_PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
    ^
nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:270:5: error: use of undeclared
identifier 'avcodec_get_frame_defaults'
    avcodec_get_frame_defaults(&srcPic) ;
    ^
nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:274:3: error: use of undeclared
identifier 'avcodec_get_frame_defaults'
         avcodec_get_frame_defaults(&convPic) ;
         ^
nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:303:22: error: use of undeclared
identifier 'PIX_FMT_RGB24'; did you mean
      'AV_PIX_FMT_RGB24'?
    if (srcEncoding==PIX_FMT_RGB24) convertImage(img, Image::RGB) ;
                     ^~~~~~~~~~~~~
                     AV_PIX_FMT_RGB24
/usr/local/include/libavutil/pixfmt.h:64:5: note: 'AV_PIX_FMT_RGB24' declared
here
    AV_PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
    ^
nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:329:20: error: use of undeclared
identifier 'avcodec_encode_video'; did you mean
      'avcodec_encode_video2'?
    int out_size = avcodec_encode_video(cctx, video_outbuf, video_outbuf_size,
picture) ;
                   ^~~~~~~~~~~~~~~~~~~~
                   avcodec_encode_video2
/usr/local/include/libavcodec/avcodec.h:5322:5: note: 'avcodec_encode_video2'
declared here
int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
    ^
nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:329:47: error: cannot initialize a
parameter of type 'AVPacket *' with an lvalue
      of type 'uint8_t *' (aka 'unsigned char *')
    int out_size = avcodec_encode_video(cctx, video_outbuf, video_outbuf_size,
picture) ;
                                              ^~~~~~~~~~~~
/usr/local/include/libavcodec/avcodec.h:5322:60: note: passing argument to
parameter 'avpkt' here
int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
                                                           ^

PR:		207547

 

14:22 miwi 

- Fix build with clang

PR:		185706
Submitted by:	ports fury