Mercurial > libavformat.hg

diff riff.c @ 5910:536e5527c1e0 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define AVMediaType enum, and use it instead of enum CodecType, which is deprecated and will be dropped at the next major bump.
author stefano
date Tue, 30 Mar 2010 23:30:55 +0000
parents 446f49e8942a
children b8882d9bad80
line wrap: on
line diff
--- a/riff.c	Tue Mar 30 15:50:57 2010 +0000
+++ b/riff.c	Tue Mar 30 23:30:55 2010 +0000
@@ -461,7 +461,7 @@
     int id;
 
     id = get_le16(pb);
-    codec->codec_type = CODEC_TYPE_AUDIO;
+    codec->codec_type = AVMEDIA_TYPE_AUDIO;
     codec->codec_tag = id;
     codec->channels = get_le16(pb);
     codec->sample_rate = get_le32(pb);
@@ -527,8 +527,8 @@
     if(stream->frame_size && stream->sample_rate){
         *au_scale=stream->frame_size;
         *au_rate= stream->sample_rate;
-    }else if(stream->codec_type == CODEC_TYPE_VIDEO ||
-             stream->codec_type == CODEC_TYPE_SUBTITLE){
+    }else if(stream->codec_type == AVMEDIA_TYPE_VIDEO ||
+             stream->codec_type == AVMEDIA_TYPE_SUBTITLE){
         *au_scale= stream->time_base.num;
         *au_rate = stream->time_base.den;
     }else{