Control: tags -1 patch

Hi,

On Wed, 24 Jan 2018 22:26:50 +0000 jcowg...@debian.org wrote:
> Source: karlyriceditor
> Version: 1.11-2
> Severity: important
> User: debian-multime...@lists.debian.org
> Usertags: ffmpeg-3.5-transition
> 
> Hi,
> 
> Your package FTBFS with the upcoming version 3.5 of FFmpeg.

The attached patch fixes this.

James
Description: Fix FTBFS with FFmpeg 4.0
Author: James Cowgill <jcowg...@debian.org>
Bug-Debian: https://bugs.debian.org/888377
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/ffmpegvideoencoder.cpp
+++ b/src/ffmpegvideoencoder.cpp
@@ -345,7 +345,7 @@ av_log_set_level(AV_LOG_VERBOSE);
 
 	// Enable interlacing if needed
 	if ( m_videoformat->flags & VIFO_INTERLACED )
-		videoCodecCtx->flags |= CODEC_FLAG_INTERLACED_DCT;
+		videoCodecCtx->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
 
 	// Enable multithreaded encoding: breaks FLV!
 	//videoCodecCtx->thread_count = 4;
@@ -373,7 +373,7 @@ av_log_set_level(AV_LOG_VERBOSE);
 
 	// If we have a global header for the format, no need to duplicate the codec info in each keyframe
 	if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER )
-		videoCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+		videoCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	// Open the codec
 	if ( ( err = avcodec_open2( videoCodecCtx, videoCodec, 0 )) < 0 )
@@ -463,7 +463,7 @@ av_log_set_level(AV_LOG_VERBOSE);
 			audioCodecCtx->time_base.den = m_profile->sampleRate;
 
 			if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER )
-				audioCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+				audioCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 			// Since different audio codecs support different sample formats, look up which one is supported by this specific codec
 			if ( isAudioSampleFormatSupported( audioCodec->sample_fmts, AV_SAMPLE_FMT_FLTP ) )

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to