Define AVMediaType enum, and use it instead of enum CodecType, which

[ffmpeg.git] / libavformat / rpl.c

diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index 62efafb..41c1687 100644 (file)
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -129,7 +129,7 @@ static int rpl_read_header(AVFormatContext *s, AVFormatParameters *ap)
     // number usually isn't important.
     // (The spec says that there exists some significance
     // for the text in a few cases; samples needed.)
     // number usually isn't important.
     // (The spec says that there exists some significance
     // for the text in a few cases; samples needed.)

-    error |= read_line(pb, line        , sizeof(line        ));  // ARMovie
+    error |= read_line(pb, line, sizeof(line));      // ARMovie

     error |= read_line(pb, line, sizeof(line));      // movie name
     av_metadata_set(&s->metadata, "title"    , line);
     error |= read_line(pb, line, sizeof(line));      // date/copyright
     error |= read_line(pb, line, sizeof(line));      // movie name
     av_metadata_set(&s->metadata, "title"    , line);
     error |= read_line(pb, line, sizeof(line));      // date/copyright


@@ -141,7 +141,7 @@ static int rpl_read_header(AVFormatContext *s, AVFormatParameters *ap)
     vst = av_new_stream(s, 0);
     if (!vst)
         return AVERROR(ENOMEM);
     vst = av_new_stream(s, 0);
     if (!vst)
         return AVERROR(ENOMEM);

-    vst->codec->codec_type      = CODEC_TYPE_VIDEO;
+    vst->codec->codec_type      = AVMEDIA_TYPE_VIDEO;

     vst->codec->codec_tag       = read_line_and_int(pb, &error);  // video format
     vst->codec->width           = read_line_and_int(pb, &error);  // video width
     vst->codec->height          = read_line_and_int(pb, &error);  // video height
     vst->codec->codec_tag       = read_line_and_int(pb, &error);  // video format
     vst->codec->width           = read_line_and_int(pb, &error);  // video width
     vst->codec->height          = read_line_and_int(pb, &error);  // video height


@@ -183,7 +183,7 @@ static int rpl_read_header(AVFormatContext *s, AVFormatParameters *ap)
         ast = av_new_stream(s, 0);
         if (!ast)
             return AVERROR(ENOMEM);
         ast = av_new_stream(s, 0);
         if (!ast)
             return AVERROR(ENOMEM);

-        ast->codec->codec_type      = CODEC_TYPE_AUDIO;
+        ast->codec->codec_type      = AVMEDIA_TYPE_AUDIO;

         ast->codec->codec_tag       = audio_format;
         ast->codec->sample_rate     = read_line_and_int(pb, &error);  // audio bitrate
         ast->codec->channels        = read_line_and_int(pb, &error);  // number of audio channels
         ast->codec->codec_tag       = audio_format;
         ast->codec->sample_rate     = read_line_and_int(pb, &error);  // audio bitrate
         ast->codec->channels        = read_line_and_int(pb, &error);  // number of audio channels


@@ -295,7 +295,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt)
         if (url_fseek(pb, index_entry->pos, SEEK_SET) < 0)
             return AVERROR(EIO);
 
         if (url_fseek(pb, index_entry->pos, SEEK_SET) < 0)
             return AVERROR(EIO);
 

-    if (stream->codec->codec_type == CODEC_TYPE_VIDEO &&
+    if (stream->codec->codec_type == AVMEDIA_TYPE_VIDEO &&

         stream->codec->codec_tag == 124) {
         // We have to split Escape 124 frames because there are
         // multiple frames per chunk in Escape 124 samples.
         stream->codec->codec_tag == 124) {
         // We have to split Escape 124 frames because there are
         // multiple frames per chunk in Escape 124 samples.


@@ -327,7 +327,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt)
             return AVERROR(EIO);
         }
 
             return AVERROR(EIO);
         }
 

-        if (stream->codec->codec_type == CODEC_TYPE_VIDEO) {
+        if (stream->codec->codec_type == AVMEDIA_TYPE_VIDEO) {

             // frames_per_chunk should always be one here; the header
             // parsing will warn if it isn't.
             pkt->duration = rpl->frames_per_chunk;
             // frames_per_chunk should always be one here; the header
             // parsing will warn if it isn't.
             pkt->duration = rpl->frames_per_chunk;