cosmetics, add demuxer word

[ffmpeg] / libavformat / txd.c

diff --git a/libavformat/txd.c b/libavformat/txd.c
index 88432266810f628a3ff1f2111d8a5d1536843c14..8092a41a4893393cafe8c9267f7f7ccb847943e6 100644 (file)
--- a/libavformat/txd.c
+++ b/libavformat/txd.c
@@ -51,7 +51,7 @@ static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) {
 }
 
 static int txd_read_packet(AVFormatContext *s, AVPacket *pkt) {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     unsigned int id, chunk_size, marker;
     int ret;
 
@@ -60,11 +60,11 @@ next_chunk:
     chunk_size = get_le32(pb);
     marker     = get_le32(pb);
 
-    if (url_feof(&s->pb))
-        return AVERROR_IO;
+    if (url_feof(s->pb))
+        return AVERROR(EIO);
     if (marker != TXD_MARKER && marker != TXD_MARKER2) {
         av_log(NULL, AV_LOG_ERROR, "marker does not match\n");
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     switch (id) {
@@ -72,19 +72,19 @@ next_chunk:
             if (chunk_size > 100)
                 break;
         case TXD_EXTRA:
-            url_fskip(&s->pb, chunk_size);
+            url_fskip(s->pb, chunk_size);
         case TXD_FILE:
         case TXD_TEXTURE:
             goto next_chunk;
         default:
             av_log(NULL, AV_LOG_ERROR, "unknown chunk id %i\n", id);
-            return AVERROR_IO;
+            return AVERROR(EIO);
     }
 
-    ret = av_get_packet(&s->pb, pkt, chunk_size);
+    ret = av_get_packet(s->pb, pkt, chunk_size);
     pkt->stream_index = 0;
 
-    return ret <= 0 ? AVERROR_IO : ret;
+    return ret <= 0 ? AVERROR(EIO) : ret;
 }
 
 static int txd_read_close(AVFormatContext *s) {