Set codec_id correctly for RJPG codec_tag

[ffmpeg] / libavformat / mtv.c

diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index fca8f76580164b214339a7d9801d43bf6723e1bf..ce70db0db399e9c588bd8634c5fb9e1d36b083f0 100644 (file)
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -96,7 +96,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     st = av_new_stream(s, VIDEO_SID);
     if(!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
 
     av_set_pts_info(st, 64, 1, mtv->video_fps);
     st->codec->codec_type      = CODEC_TYPE_VIDEO;
@@ -111,7 +111,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     st = av_new_stream(s, AUDIO_SID);
     if(!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
 
     av_set_pts_info(st, 64, 1, AUDIO_SAMPLING_RATE);
     st->codec->codec_type      = CODEC_TYPE_AUDIO;
@@ -122,7 +122,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
     /* Jump over header */
 
     if(url_fseek(pb, MTV_HEADER_SIZE, SEEK_SET) != MTV_HEADER_SIZE)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     return(0);
 
@@ -145,7 +145,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
 
         ret = av_get_packet(pb, pkt, MTV_ASUBCHUNK_DATA_SIZE);
         if(ret != MTV_ASUBCHUNK_DATA_SIZE)
-            return AVERROR_IO;
+            return AVERROR(EIO);
 
         mtv->audio_packet_count++;
         pkt->stream_index = AUDIO_SID;
@@ -154,7 +154,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
     {
         ret = av_get_packet(pb, pkt, mtv->img_segment_size);
         if(ret != mtv->img_segment_size)
-            return AVERROR_IO;
+            return AVERROR(EIO);
 
 #ifndef WORDS_BIGENDIAN