From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: alsa-plugins: pcm_a52.c uses recently removed
	avcodec_{alloc, free}_frame
Date: Wed, 09 Mar 2016 09:20:23 +0100
Message-ID: <s5hwppc9i60.wl-tiwai@suse.de>
References: <20160309091811.580705f2@ekpyrosis>
Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-bounces@alsa-project.org>
Received: from mx2.suse.de (mx2.suse.de [195.135.220.15])
 by alsa0.perex.cz (Postfix) with ESMTP id D9E2F260524
 for <alsa-devel@alsa-project.org>; Wed,  9 Mar 2016 09:20:23 +0100 (CET)
In-Reply-To: <20160309091811.580705f2@ekpyrosis>
List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>,
 <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe>
List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/>
List-Post: <mailto:alsa-devel@alsa-project.org>
List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help>
List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
 <mailto:alsa-devel-request@alsa-project.org?subject=subscribe>
Errors-To: alsa-devel-bounces@alsa-project.org
Sender: alsa-devel-bounces@alsa-project.org
To: Daniel Kirchner <daniel@ekpyron.org>
Cc: alsa-devel@alsa-project.org
List-Id: alsa-devel@alsa-project.org

On Wed, 09 Mar 2016 09:18:11 +0100,
Daniel Kirchner wrote:
> 
> pcm_a52.c uses avcodec_alloc_frame and avcodec_free_frame that have
> been replaced by av_frame_alloc and av_frame_free in recent versions of
> libavcodec. The following patch should fix this while remaining
> backwards compatible.

Thanks, applied to git tree now.


Takashi

> 
> 
> --- a/a52/pcm_a52.c.orig	2016-03-04 18:21:12.606805770 +0100
> +++ b/a52/pcm_a52.c	2016-03-04 18:34:22.653240501 +0100
> @@ -62,6 +62,11 @@
>  #define AV_CODEC_ID_AC3 CODEC_ID_AC3
>  #endif
>  
> +#if LIBAVCODEC_VERSION_INT < 0x371c01
> +#define av_frame_alloc avcodec_alloc_frame
> +#define av_frame_free avcodec_free_frame
> +#endif
> +
>  struct a52_ctx {
>  	snd_pcm_ioplug_t io;
>  	snd_pcm_t *slave;
> @@ -513,7 +518,7 @@
>  		rec->inbuf = NULL;
>  	}
>  #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
> -	avcodec_free_frame(&rec->frame);
> +	av_frame_free(&rec->frame);
>  #else
>  	av_freep(&rec->frame);
>  #endif
> @@ -557,7 +562,7 @@
>  {
>  	struct a52_ctx *rec = io->private_data;
>  #ifdef USE_AVCODEC_FRAME
> -	rec->frame = avcodec_alloc_frame();
> +	rec->frame = av_frame_alloc();
>  	if (!rec->frame)
>  		return -ENOMEM;
>  	if (av_samples_alloc(rec->frame->data, rec->frame->linesize,
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>