* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/intreadwrite.h"
#include "avformat.h"
#define TXD_FILE 0x16
st = av_new_stream(s, 0);
if (!st)
return AVERROR(ENOMEM);
- st->codec->codec_type = CODEC_TYPE_VIDEO;
+ 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;
}
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(EIO);
+ return AVERROR_EOF;
if (marker != TXD_MARKER && marker != TXD_MARKER2) {
- av_log(NULL, AV_LOG_ERROR, "marker does not match\n");
- return AVERROR(EIO);
+ av_log(s, AV_LOG_ERROR, "marker does not match\n");
+ return AVERROR_INVALIDDATA;
}
switch (id) {
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(EIO);
+ av_log(s, AV_LOG_ERROR, "unknown chunk id %i\n", id);
+ return AVERROR_INVALIDDATA;
}
ret = av_get_packet(s->pb, pkt, chunk_size);
+ if (ret < 0)
+ return ret;
pkt->stream_index = 0;
- return ret <= 0 ? AVERROR(EIO) : ret;
-}
-
-static int txd_read_close(AVFormatContext *s) {
return 0;
}
-AVInputFormat txd_demuxer =
+AVInputFormat ff_txd_demuxer =
{
"txd",
- NULL_IF_CONFIG_SMALL("txd format"),
+ NULL_IF_CONFIG_SMALL("Renderware TeXture Dictionary"),
0,
txd_probe,
txd_read_header,
txd_read_packet,
- txd_read_close,
};