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 --- libavdevice/alsa-audio-dec.c | 2 +- libavdevice/bktr.c | 2 +- libavdevice/jack_audio.c | 2 +- libavdevice/libdc1394.c | 2 +- libavdevice/oss_audio.c | 2 +- libavdevice/v4l.c | 2 +- libavdevice/v4l2.c | 2 +- libavdevice/vfwcap.c | 2 +- libavdevice/x11grab.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libavdevice') diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c index 833bca3b06..1fb0bf5c68 100644 --- a/libavdevice/alsa-audio-dec.c +++ b/libavdevice/alsa-audio-dec.c @@ -111,7 +111,7 @@ static av_cold int audio_read_header(AVFormatContext *s1, } /* take real parameters */ - st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = codec_id; st->codec->sample_rate = sample_rate; st->codec->channels = ap->channels; diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index c63d79ea28..afb94b6c5d 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -269,7 +269,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) s->frame_rate_base = frame_rate_base; s->per_frame = ((uint64_t)1000000 * s->frame_rate_base) / s->frame_rate; - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->pix_fmt = PIX_FMT_YUV420P; st->codec->codec_id = CODEC_ID_RAWVIDEO; st->codec->width = width; diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c index fa1fba13ca..b41bbdf902 100644 --- a/libavdevice/jack_audio.c +++ b/libavdevice/jack_audio.c @@ -237,7 +237,7 @@ static int audio_read_header(AVFormatContext *context, AVFormatParameters *param return AVERROR(ENOMEM); } - stream->codec->codec_type = CODEC_TYPE_AUDIO; + stream->codec->codec_type = AVMEDIA_TYPE_AUDIO; #if HAVE_BIGENDIAN stream->codec->codec_id = CODEC_ID_PCM_F32BE; #else diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 0d8e36ad63..8ffbc58974 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -117,7 +117,7 @@ static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap, if (!vst) goto out; av_set_pts_info(vst, 64, 1, 1000); - vst->codec->codec_type = CODEC_TYPE_VIDEO; + vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; vst->codec->codec_id = CODEC_ID_RAWVIDEO; vst->codec->time_base.den = fps->frame_rate; vst->codec->time_base.num = 1000; diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index 8e4dbf2fc4..d382c0376e 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -232,7 +232,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap) } /* take real parameters */ - st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = s->codec_id; st->codec->sample_rate = s->sample_rate; st->codec->channels = s->channels; diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index 3382cdb0ae..d0ef7d5e04 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -242,7 +242,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) s->fd = video_fd; - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_RAWVIDEO; st->codec->width = s->video_win.width; st->codec->height = s->video_win.height; diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 36c8d66c6b..9cc6806256 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -646,7 +646,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) } s->top_field_first = first_field(s->fd); - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = codec_id; st->codec->width = width; st->codec->height = height; diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 9f242f80f9..9f54494c83 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -353,7 +353,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) codec = st->codec; codec->time_base = ap->time_base; - codec->codec_type = CODEC_TYPE_VIDEO; + codec->codec_type = AVMEDIA_TYPE_VIDEO; codec->width = width; codec->height = height; codec->pix_fmt = vfw_pixfmt(biCompression, biBitCount); diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 045b82306e..865206dfcf 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -226,7 +226,7 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) x11grab->image = image; x11grab->use_shm = use_shm; - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_RAWVIDEO; st->codec->width = ap->width; st->codec->height = ap->height; -- cgit v1.2.3