diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-30 23:30:55 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-30 23:30:55 +0000 |
| commit | 72415b2adb2c25f95ceede49001bb97ed9247dbb (patch) | |
| tree | 99247889aa61bb7621c966466ea4b84c100207d3 /libavformat/gxf.c | |
| parent | ca6e7708b42e7d33ba3053bcd447d52a077bca25 (diff) | |
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
Diffstat (limited to 'libavformat/gxf.c')
| -rw-r--r-- | libavformat/gxf.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/gxf.c b/libavformat/gxf.c index 774f61aedc..ea8a2fff7f 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -87,34 +87,34 @@ static int get_sindex(AVFormatContext *s, int id, int format) { switch (format) { case 3: case 4: - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_MJPEG; break; case 13: case 15: - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_DVVIDEO; break; case 14: case 16: - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_DVVIDEO; break; case 11: case 12: case 20: - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_MPEG2VIDEO; st->need_parsing = AVSTREAM_PARSE_HEADERS; //get keyframe flag etc. break; case 22: case 23: - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_MPEG1VIDEO; st->need_parsing = AVSTREAM_PARSE_HEADERS; //get keyframe flag etc. break; case 9: - st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_PCM_S24LE; st->codec->channels = 1; st->codec->sample_rate = 48000; @@ -123,7 +123,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) { st->codec->bits_per_coded_sample = 24; break; case 10: - st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_PCM_S16LE; st->codec->channels = 1; st->codec->sample_rate = 48000; @@ -132,7 +132,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) { st->codec->bits_per_coded_sample = 16; break; case 17: - st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_AC3; st->codec->channels = 2; st->codec->sample_rate = 48000; @@ -141,11 +141,11 @@ static int get_sindex(AVFormatContext *s, int id, int format) { case 7: case 8: case 24: - st->codec->codec_type = CODEC_TYPE_DATA; + st->codec->codec_type = AVMEDIA_TYPE_DATA; st->codec->codec_id = CODEC_ID_NONE; break; default: - st->codec->codec_type = CODEC_TYPE_UNKNOWN; + st->codec->codec_type = AVMEDIA_TYPE_UNKNOWN; st->codec->codec_id = CODEC_ID_NONE; break; } |