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 --- libavformat/swfenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavformat/swfenc.c') diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 60b7171cc9..1a1a9ab808 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -185,7 +185,7 @@ static int swf_write_header(AVFormatContext *s) for(i=0;inb_streams;i++) { AVCodecContext *enc = s->streams[i]->codec; - if (enc->codec_type == CODEC_TYPE_AUDIO) { + if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { if (enc->codec_id == CODEC_ID_MP3) { if (!enc->frame_size) { av_log(s, AV_LOG_ERROR, "audio frame size not set\n"); @@ -464,7 +464,7 @@ static int swf_write_audio(AVFormatContext *s, static int swf_write_packet(AVFormatContext *s, AVPacket *pkt) { AVCodecContext *codec = s->streams[pkt->stream_index]->codec; - if (codec->codec_type == CODEC_TYPE_AUDIO) + if (codec->codec_type == AVMEDIA_TYPE_AUDIO) return swf_write_audio(s, codec, pkt->data, pkt->size); else return swf_write_video(s, codec, pkt->data, pkt->size); @@ -480,7 +480,7 @@ static int swf_write_trailer(AVFormatContext *s) video_enc = NULL; for(i=0;inb_streams;i++) { enc = s->streams[i]->codec; - if (enc->codec_type == CODEC_TYPE_VIDEO) + if (enc->codec_type == AVMEDIA_TYPE_VIDEO) video_enc = enc; else av_fifo_free(swf->audio_fifo); -- cgit v1.2.3