Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / txd.c

diff --git a/libavformat/txd.c b/libavformat/txd.c
index 19febd160cc1f9be41f8a85bc599ae52a9ad54db..05eb0ce6f32c050cfdec1909f28d1da6501172e9 100644 (file)
--- a/libavformat/txd.c
+++ b/libavformat/txd.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define TXD_FILE            0x16
@@ -41,8 +42,8 @@ static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) {
 
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
-    st->codec->codec_type = CODEC_TYPE_VIDEO;
+        return AVERROR(ENOMEM);
+    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     st->codec->codec_id = CODEC_ID_TXD;
     st->codec->time_base.den = 5;
     st->codec->time_base.num = 1;
@@ -51,20 +52,20 @@ static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) {
 }
 
 static int txd_read_packet(AVFormatContext *s, AVPacket *pkt) {
-    ByteIOContext *pb = &s->pb;
+    AVIOContext *pb = s->pb;
     unsigned int id, chunk_size, marker;
     int ret;
 
 next_chunk:
-    id         = get_le32(pb);
-    chunk_size = get_le32(pb);
-    marker     = get_le32(pb);
+    id         = avio_rl32(pb);
+    chunk_size = avio_rl32(pb);
+    marker     = avio_rl32(pb);
 
-    if (url_feof(&s->pb))
-        return AVERROR_IO;
+    if (url_feof(s->pb))
+        return AVERROR_EOF;
     if (marker != TXD_MARKER && marker != TXD_MARKER2) {
-        av_log(NULL, AV_LOG_ERROR, "marker does not match\n");
-        return AVERROR_IO;
+        av_log(s, AV_LOG_ERROR, "marker does not match\n");
+        return AVERROR_INVALIDDATA;
     }
 
     switch (id) {
@@ -72,32 +73,29 @@ next_chunk:
             if (chunk_size > 100)
                 break;
         case TXD_EXTRA:
-            url_fskip(&s->pb, chunk_size);
+            avio_skip(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;
+            av_log(s, AV_LOG_ERROR, "unknown chunk id %i\n", id);
+            return AVERROR_INVALIDDATA;
     }
 
-    ret = av_get_packet(&s->pb, pkt, chunk_size);
+    ret = av_get_packet(s->pb, pkt, chunk_size);
+    if (ret < 0)
+        return ret;
     pkt->stream_index = 0;
 
-    return ret <= 0 ? AVERROR_IO : ret;
-}
-
-static int txd_read_close(AVFormatContext *s) {
     return 0;
 }
 
-AVInputFormat txd_demuxer =
+AVInputFormat ff_txd_demuxer =
 {
     "txd",
-    "txd format",
+    NULL_IF_CONFIG_SMALL("Renderware TeXture Dictionary"),
     0,
     txd_probe,
     txd_read_header,
     txd_read_packet,
-    txd_read_close,
 };