alsa-plugins: pcm_a52.c uses recently removed avcodec_{alloc, free}_frame

alsa-plugins: pcm_a52.c uses recently removed avcodec_{alloc, free}_frame

[Daniel Kirchner]

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.


--- 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-plugins: pcm_a52.c uses recently removed avcodec_{alloc, free}_frame

[Daniel Kirchner]

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.


--- 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,

Re: alsa-plugins: pcm_a52.c uses recently removed avcodec_{alloc, free}_frame

[Takashi Iwai]

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
>