From 72415b2adb2c25f95ceede49001bb97ed9247dbb Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 30 Mar 2010 23:30:55 +0000 Subject: Define AVMediaType enum, and use it instead of enum CodecType, which is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/pnmdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec/pnmdec.c') diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index 5630e7689c..66033c1f4e 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -190,7 +190,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, #if CONFIG_PGM_DECODER AVCodec pgm_decoder = { "pgm", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PGM, sizeof(PNMContext), ff_pnm_init, @@ -206,7 +206,7 @@ AVCodec pgm_decoder = { #if CONFIG_PGMYUV_DECODER AVCodec pgmyuv_decoder = { "pgmyuv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PGMYUV, sizeof(PNMContext), ff_pnm_init, @@ -222,7 +222,7 @@ AVCodec pgmyuv_decoder = { #if CONFIG_PPM_DECODER AVCodec ppm_decoder = { "ppm", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PPM, sizeof(PNMContext), ff_pnm_init, @@ -238,7 +238,7 @@ AVCodec ppm_decoder = { #if CONFIG_PBM_DECODER AVCodec pbm_decoder = { "pbm", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PBM, sizeof(PNMContext), ff_pnm_init, @@ -254,7 +254,7 @@ AVCodec pbm_decoder = { #if CONFIG_PAM_DECODER AVCodec pam_decoder = { "pam", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PAM, sizeof(PNMContext), ff_pnm_init, -- cgit v1.2.3