[PATCH] a52: Make compatible with ffmpeg 3.0

[PATCH] a52: Make compatible with ffmpeg 3.0

[Anatol Pomozov]

audioconvert.h has been deprecated a while ago and got removed in
ffmpeg 3.0 (commit 2d40968dd3ff17b12f7).

Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
---
 a52/pcm_a52.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
index 88529eb..6fad77d 100644
--- a/a52/pcm_a52.c
+++ b/a52/pcm_a52.c
@@ -39,7 +39,7 @@
 #endif
 
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0)
-#include <libavutil/audioconvert.h>
+#include <libavutil/channel_layout.h>
 #include <libavutil/mem.h>
 #define USE_AVCODEC_FRAME
 #endif
-- 
2.7.1

Re: [PATCH] a52: Make compatible with ffmpeg 3.0

[Takashi Iwai]

On Tue, 16 Feb 2016 02:49:22 +0100,
Anatol Pomozov wrote:
> 
> audioconvert.h has been deprecated a while ago and got removed in
> ffmpeg 3.0 (commit 2d40968dd3ff17b12f7).
> 
> Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>

Applied, thanks.


Takashi


> ---
>  a52/pcm_a52.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
> index 88529eb..6fad77d 100644
> --- a/a52/pcm_a52.c
> +++ b/a52/pcm_a52.c
> @@ -39,7 +39,7 @@
>  #endif
>  
>  #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0)
> -#include <libavutil/audioconvert.h>
> +#include <libavutil/channel_layout.h>
>  #include <libavutil/mem.h>
>  #define USE_AVCODEC_FRAME
>  #endif
> -- 
> 2.7.1
> 

Re: [PATCH] a52: Make compatible with ffmpeg 3.0

[Anatol Pomozov]

Thank you.

I also see a number of "deprecated API" message that makes sense to
look at as well:




rate_lavcrate.c:70:3: warning: 'av_resample_close' is deprecated
[-Wdeprecated-declarations]
   av_resample_close(rate->context);
   ^
In file included from rate_lavcrate.c:22:0:
/usr/include/libavcodec/avcodec.h:4854:6: note: declared here
 void av_resample_close(struct AVResampleContext *c);
      ^
rate_lavcrate.c: In function 'pcm_src_init':
rate_lavcrate.c:96:3: warning: 'av_resample_init' is deprecated
[-Wdeprecated-declarations]
   rate->context = av_resample_init(info->out.rate, info->in.rate,
   ^
In file included from rate_lavcrate.c:22:0:
/usr/include/libavcodec/avcodec.h:4824:27: note: declared here
 struct AVResampleContext *av_resample_init(int out_rate, int in_rate,
int filter_length, int log2_phase_count, int linear, double cutoff);
                           ^
rate_lavcrate.c: In function 'pcm_src_convert_s16':
rate_lavcrate.c:186:3: warning: 'av_resample' is deprecated
[-Wdeprecated-declarations]
   ret = av_resample(rate->context, rate->out[i],
   ^
In file included from rate_lavcrate.c:22:0:
/usr/include/libavcodec/avcodec.h:4836:5: note: declared here
 int av_resample(struct AVResampleContext *c, short *dst, short *src,
int *consumed, int src_size, int dst_size, int update_ctx);
     ^
rate_lavcrate.c:194:2: warning: 'av_resample_compensate' is deprecated
[-Wdeprecated-declarations]
  av_resample_compensate(rate->context,
  ^
In file included from rate_lavcrate.c:22:0:
/usr/include/libavcodec/avcodec.h:4852:6: note: declared here
 void av_resample_compensate(struct AVResampleContext *c, int
sample_delta, int compensation_distance);
      ^

Re: [PATCH] a52: Make compatible with ffmpeg 3.0

[Anton Khirnov]

Quoting Anatol Pomozov (2016-04-01 20:47:38)
> Thank you.
> 
> I also see a number of "deprecated API" message that makes sense to
> look at as well:
> 
> 
> 
> 
> rate_lavcrate.c:70:3: warning: 'av_resample_close' is deprecated
> [-Wdeprecated-declarations]
>    av_resample_close(rate->context);
>    ^
> In file included from rate_lavcrate.c:22:0:
> /usr/include/libavcodec/avcodec.h:4854:6: note: declared here
>  void av_resample_close(struct AVResampleContext *c);
>       ^
> rate_lavcrate.c: In function 'pcm_src_init':
> rate_lavcrate.c:96:3: warning: 'av_resample_init' is deprecated
> [-Wdeprecated-declarations]
>    rate->context = av_resample_init(info->out.rate, info->in.rate,
>    ^
> In file included from rate_lavcrate.c:22:0:
> /usr/include/libavcodec/avcodec.h:4824:27: note: declared here
>  struct AVResampleContext *av_resample_init(int out_rate, int in_rate,
> int filter_length, int log2_phase_count, int linear, double cutoff);
>                            ^
> rate_lavcrate.c: In function 'pcm_src_convert_s16':
> rate_lavcrate.c:186:3: warning: 'av_resample' is deprecated
> [-Wdeprecated-declarations]
>    ret = av_resample(rate->context, rate->out[i],
>    ^
> In file included from rate_lavcrate.c:22:0:
> /usr/include/libavcodec/avcodec.h:4836:5: note: declared here
>  int av_resample(struct AVResampleContext *c, short *dst, short *src,
> int *consumed, int src_size, int dst_size, int update_ctx);
>      ^
> rate_lavcrate.c:194:2: warning: 'av_resample_compensate' is deprecated
> [-Wdeprecated-declarations]
>   av_resample_compensate(rate->context,
>   ^
> In file included from rate_lavcrate.c:22:0:
> /usr/include/libavcodec/avcodec.h:4852:6: note: declared here
>  void av_resample_compensate(struct AVResampleContext *c, int
> sample_delta, int compensation_distance);
>       ^

I'm not sure why I'm even on this list, but maybe the patch I wrote for
Debian a couple years back will be useful:
https://git.khirnov.net/alsa-plugins.git/commit/?id=218debf474d1eca279dbb515d1faccc4c0c70b2c
Seems we never got to submitting it upstream.

-- 
Anton Khirnov