indent

[ffmpeg] / libavformat / mtv.c

diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 2d4832c2cdcb511746ca654a995d77b05b930fa4..557846f6eb17361ab0c7d543d7fb4f77294c8f15 100644 (file)
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -24,8 +24,8 @@
  * MTV demuxer.
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
-#include "bswap.h"
 
 #define MTV_ASUBCHUNK_DATA_SIZE 500
 #define MTV_HEADER_SIZE 512
@@ -65,7 +65,7 @@ static int mtv_probe(AVProbeData *p)
 static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
     MTVDemuxContext    *mtv = s->priv_data;
-    ByteIOContext      *pb  = &s->pb;
+    ByteIOContext      *pb  = s->pb;
     AVStream           *st;
 
 
@@ -122,16 +122,16 @@ 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);
+    return 0;
 
 }
 
 static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     MTVDemuxContext *mtv = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     int ret;
 #ifndef WORDS_BIGENDIAN
     int i;
@@ -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
 
@@ -171,12 +171,12 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
         pkt->stream_index = VIDEO_SID;
     }
 
-    return(ret);
+    return ret;
 }
 
 AVInputFormat mtv_demuxer = {
     "MTV",
-    "MTV format",
+    NULL_IF_CONFIG_SMALL("MTV format"),
     sizeof(MTVDemuxContext),
     mtv_probe,
     mtv_read_header,