vlc | branch: master | Steve Lhomme <[email protected]> | Wed Jul 5 17:09:15 2017 +0200| [a599a6b0277fe7daf8857ca15213058adb43d591] | committer: Rémi Denis-Courmont
avcodec: pass the ES category as an enum es_format_category_e Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a599a6b0277fe7daf8857ca15213058adb43d591 --- modules/codec/avcodec/avcodec.h | 2 +- modules/codec/avcodec/fourcc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h index aec123dbef..f64fc55cc5 100644 --- a/modules/codec/avcodec/avcodec.h +++ b/modules/codec/avcodec/avcodec.h @@ -25,7 +25,7 @@ #include "avcommon.h" /* VLC <-> avcodec tables */ -bool GetFfmpegCodec( unsigned cat, vlc_fourcc_t i_fourcc, +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 ); vlc_fourcc_t GetVlcAudioFormat( int i_sample_fmt ); diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index b3a4355e91..4f2a3cd422 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -489,7 +489,7 @@ static const struct vlc_avcodec_fourcc spu_codecs[] = /* ffmpeg only: AV_CODEC_ID_ASS */ }; -bool GetFfmpegCodec( unsigned cat, vlc_fourcc_t i_fourcc, +bool GetFfmpegCodec( enum es_format_category_e cat, vlc_fourcc_t i_fourcc, unsigned *pi_ffmpeg_codec, const char **ppsz_name ) { const struct vlc_avcodec_fourcc *base; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
