Bug#888370: avifile: FTBFS with FFmpeg 4.0

[James Cowgill]

Control: tags -1 patch

Hi,

On Wed, 24 Jan 2018 22:26:50 +0000 jcowg...@debian.org wrote:
> Source: avifile
> Version: 1:0.7.48~20090503.ds-20
> 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/888370
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/lib/aviread/FFReadStream.cpp
+++ b/lib/aviread/FFReadStream.cpp
@@ -69,7 +69,7 @@ FFReadStream::FFReadStream(FFReadHandler
 	    AVCodec* codec = avcodec_find_decoder(avs->codec->codec_id);
 	    if (codec && avcodec_open2(m_pAvContext, codec, NULL) == 0)
 	    {
-		m_pAvContext->flags |= CODEC_FLAG_TRUNCATED;
+		m_pAvContext->flags |= AV_CODEC_FLAG_TRUNCATED;
 		m_pAvContext->skip_frame = AVDISCARD_NONKEY;
 		//printf("Opened hurryup decoder %p  %p\n", codec, m_pAvContext->codec->decode);
 	    }
--- a/plugins/libffmpeg/FFVideoDecoder.cpp
+++ b/plugins/libffmpeg/FFVideoDecoder.cpp
@@ -38,7 +38,7 @@ FFVideoDecoder::FFVideoDecoder(AVCodec*
     if (0 && m_pFormat->biCompression == fccHFYU)
     {
 	// for now disabled
-	m_pAvCodec->capabilities &= ~(CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1);
+	m_pAvCodec->capabilities &= ~(AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1);
 	AVM_WRITE(m_Info.GetPrivateName(), "if you have troubles - use Win32 codec instead\n");
 	m_Caps = (CAPS) (m_Caps | CAP_YUY2);
     }
@@ -191,7 +191,7 @@ int FFVideoDecoder::DecodeFrame(CImage*
 	const char* drtxt = "doesn't support";
 
 	m_bDirect = false;
-	if (m_pAvCodec->capabilities & CODEC_CAP_DR1)
+	if (m_pAvCodec->capabilities & AV_CODEC_CAP_DR1)
 	{
 	    drtxt = "not using";
 	    if (pImage)
@@ -296,7 +296,7 @@ int FFVideoDecoder::DecodeFrame(CImage*
     // try using draw_horiz_band if DR1 is unsupported
     m_pAvContext->draw_horiz_band =
 	(!m_bDirect && pImage && pImage->Format() == IMG_FMT_YV12
-	 && (m_pAvCodec->capabilities & CODEC_CAP_DRAW_HORIZ_BAND)
+	 && (m_pAvCodec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND)
 	 && !pImage->Direction() && render) ? draw_slice : 0;
     m_pAvContext->opaque = this;
 
@@ -330,7 +330,7 @@ int FFVideoDecoder::DecodeFrame(CImage*
 	av_frame_unref(pic);
 	return hr;
     }
-    if (!(m_pAvContext->flags & CODEC_FLAG_TRUNCATED))
+    if (!(m_pAvContext->flags & AV_CODEC_FLAG_TRUNCATED))
     {
 	hr = (int)size;
 	//m_bUsed = true;

signature.asc
Description: OpenPGP digital signature