From c663b44b90e7a1a963d69c5c817bc4a0c326d375 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Fri, 25 Jun 2021 14:19:46 +0200
Subject: [PATCH] avcodec: use enum AVCodecID where a codec ID is expected

---
 modules/codec/avcodec/avcodec.c | 2 +-
 modules/codec/avcodec/avcodec.h | 4 ++--
 modules/codec/avcodec/encoder.c | 2 +-
 modules/codec/avcodec/fourcc.c  | 6 +++---
 modules/demux/avformat/mux.c    | 2 +-
 modules/packetizer/avparser.c   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 1dbb738a02..9c1b3f1907 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -202,7 +202,7 @@ vlc_module_end ()
 AVCodecContext *ffmpeg_AllocContext( decoder_t *p_dec,
                                      const AVCodec **restrict codecp )
 {
-    unsigned i_codec_id;
+    enum AVCodecID i_codec_id;
     const char *psz_namecodec;
     const AVCodec *p_codec = NULL;
 
diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index ff083d928b..74cee74bc3 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -25,8 +25,8 @@
 
 /* VLC <-> avcodec tables */
 bool GetFfmpegCodec( enum es_format_category_e cat, vlc_fourcc_t i_fourcc,
-                     unsigned *pi_ffmpeg_codec, const char **ppsz_name );
-vlc_fourcc_t GetVlcFourcc( unsigned i_ffmpeg_codec );
+                     enum AVCodecID *pi_ffmpeg_codec, const char **ppsz_name );
+vlc_fourcc_t GetVlcFourcc( enum AVCodecID i_ffmpeg_codec );
 vlc_fourcc_t GetVlcAudioFormat( int i_sample_fmt );
 
 /* Video encoder module */
diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index ae25443893..2cfbdc37cc 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -297,7 +297,7 @@ int InitVideoEnc( vlc_object_t *p_this )
     encoder_sys_t *p_sys;
     AVCodecContext *p_context;
     AVCodec *p_codec = NULL;
-    unsigned i_codec_id;
+    enum AVCodecID i_codec_id;
     const char *psz_namecodec;
     float f_val;
     char *psz_val;
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index cc281fe313..4c0f406bc3 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -38,7 +38,7 @@
 struct vlc_avcodec_fourcc
 {
     vlc_fourcc_t i_fourcc;
-    unsigned i_codec;
+    enum AVCodecID i_codec;
 };
 
 /*
@@ -535,7 +535,7 @@ static const struct vlc_avcodec_fourcc spu_codecs[] =
 };
 
 bool GetFfmpegCodec( enum es_format_category_e cat, vlc_fourcc_t i_fourcc,
-                     unsigned *pi_ffmpeg_codec, const char **ppsz_name )
+                     enum AVCodecID *pi_ffmpeg_codec, const char **ppsz_name )
 {
     const struct vlc_avcodec_fourcc *base;
     size_t count;
@@ -575,7 +575,7 @@ bool GetFfmpegCodec( enum es_format_category_e cat, vlc_fourcc_t i_fourcc,
     return false;
 }
 
-vlc_fourcc_t GetVlcFourcc( unsigned i_ffmpeg_codec )
+vlc_fourcc_t GetVlcFourcc( enum AVCodecID i_ffmpeg_codec )
 {
     for( size_t i = 0; i < ARRAY_SIZE(video_codecs); i++ )
     {
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index c4675800d9..74de67a08a 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -197,7 +197,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
 {
     sout_mux_sys_t *p_sys = p_mux->p_sys;
     const es_format_t *fmt = p_input->p_fmt;
-    unsigned i_codec_id;
+    enum AVCodecID i_codec_id;
 
     msg_Dbg( p_mux, "adding input" );
 
diff --git a/modules/packetizer/avparser.c b/modules/packetizer/avparser.c
index 849120722f..7a50205966 100644
--- a/modules/packetizer/avparser.c
+++ b/modules/packetizer/avparser.c
@@ -89,7 +89,7 @@ int avparser_OpenPacketizer( vlc_object_t *p_this )
     if( p_dec->fmt_in.i_codec != VLC_CODEC_VP9 )
         return VLC_EGENERIC;
 
-    unsigned i_avcodec_id;
+    enum AVCodecID i_avcodec_id;
 
     if( !GetFfmpegCodec( p_dec->fmt_in.i_cat, p_dec->fmt_in.i_codec,
                          &i_avcodec_id, NULL ) )