ports/net-p2p/retroshare/files/patch-ffmpeg4
Jan Beich 2ba946f46e net-p2p/retroshare: unbreak with ffmpeg 4.0
gui/VideoProcessor.cpp:456:40: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED'
    if (encoding_codec->capabilities & CODEC_CAP_TRUNCATED)
                                       ^
gui/VideoProcessor.cpp:457:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED'
        encoding_context->flags |= CODEC_FLAG_TRUNCATED;
                                   ^
gui/VideoProcessor.cpp:458:32: error: use of undeclared identifier 'CODEC_FLAG_PSNR'
    encoding_context->flags |= CODEC_FLAG_PSNR;//Peak signal-to-noise ratio
                               ^
gui/VideoProcessor.cpp:459:32: error: use of undeclared identifier 'CODEC_CAP_PARAM_CHANGE'
    encoding_context->flags |= CODEC_CAP_PARAM_CHANGE;
                               ^
gui/VideoProcessor.cpp:552:39: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED'
    if(decoding_codec->capabilities & CODEC_CAP_TRUNCATED)
                                      ^
gui/VideoProcessor.cpp:553:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED'
        decoding_context->flags |= CODEC_FLAG_TRUNCATED; // we do not send complete frames
                                   ^
gui/VideoProcessor.cpp:555:33: error: use of undeclared identifier 'CODEC_FLAG2_CHUNKS'
    decoding_context->flags2 |= CODEC_FLAG2_CHUNKS;
                                ^

PR:		227726
Reported by:	antoine (via exp-run)
2018-05-02 17:41:01 +00:00

53 lines
2.8 KiB
Text

gui/VideoProcessor.cpp:456:40: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED'
if (encoding_codec->capabilities & CODEC_CAP_TRUNCATED)
^
gui/VideoProcessor.cpp:457:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED'
encoding_context->flags |= CODEC_FLAG_TRUNCATED;
^
gui/VideoProcessor.cpp:458:32: error: use of undeclared identifier 'CODEC_FLAG_PSNR'
encoding_context->flags |= CODEC_FLAG_PSNR;//Peak signal-to-noise ratio
^
gui/VideoProcessor.cpp:459:32: error: use of undeclared identifier 'CODEC_CAP_PARAM_CHANGE'
encoding_context->flags |= CODEC_CAP_PARAM_CHANGE;
^
gui/VideoProcessor.cpp:552:39: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED'
if(decoding_codec->capabilities & CODEC_CAP_TRUNCATED)
^
gui/VideoProcessor.cpp:553:36: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED'
decoding_context->flags |= CODEC_FLAG_TRUNCATED; // we do not send complete frames
^
gui/VideoProcessor.cpp:555:33: error: use of undeclared identifier 'CODEC_FLAG2_CHUNKS'
decoding_context->flags2 |= CODEC_FLAG2_CHUNKS;
^
--- plugins/VOIP/gui/VideoProcessor.cpp.orig 2017-08-03 19:29:52 UTC
+++ plugins/VOIP/gui/VideoProcessor.cpp
@@ -453,10 +453,10 @@ FFmpegVideo::FFmpegVideo()
encoding_context->rc_max_rate = 0;
encoding_context->rc_buffer_size = 0;
#endif
- if (encoding_codec->capabilities & CODEC_CAP_TRUNCATED)
- encoding_context->flags |= CODEC_FLAG_TRUNCATED;
- encoding_context->flags |= CODEC_FLAG_PSNR;//Peak signal-to-noise ratio
- encoding_context->flags |= CODEC_CAP_PARAM_CHANGE;
+ if (encoding_codec->capabilities & AV_CODEC_CAP_TRUNCATED)
+ encoding_context->flags |= AV_CODEC_FLAG_TRUNCATED;
+ encoding_context->flags |= AV_CODEC_FLAG_PSNR;//Peak signal-to-noise ratio
+ encoding_context->flags |= AV_CODEC_CAP_PARAM_CHANGE;
encoding_context->i_quant_factor = 0.769f;
encoding_context->b_quant_factor = 1.4f;
encoding_context->time_base.num = 1;
@@ -549,10 +549,10 @@ FFmpegVideo::FFmpegVideo()
decoding_context->pix_fmt = AV_PIX_FMT_YUV420P;
#endif
- if(decoding_codec->capabilities & CODEC_CAP_TRUNCATED)
- decoding_context->flags |= CODEC_FLAG_TRUNCATED; // we do not send complete frames
+ if(decoding_codec->capabilities & AV_CODEC_CAP_TRUNCATED)
+ decoding_context->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames
//we can receive truncated frames
- decoding_context->flags2 |= CODEC_FLAG2_CHUNKS;
+ decoding_context->flags2 |= AV_CODEC_FLAG2_CHUNKS;
AVDictionary* dictionary = NULL;
if(avcodec_open2(decoding_context, decoding_codec, &dictionary) < 0)