Revision b5947324758ae2a99ebf910ad425fdde69b23935 authored by Ronald S. Bultje on 07 March 2012, 19:06:20 UTC, committed by Janne Grunau on 14 March 2012, 22:30:19 UTC
The argument is not a literal, thus causing the ARM v6 or later builds to break. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
1 parent ce15406
txd.c
/*
* Renderware TeXture Dictionary (.txd) demuxer
* Copyright (c) 2007 Ivo van Poorten
*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#define TXD_FILE 0x16
#define TXD_INFO 0x01
#define TXD_EXTRA 0x03
#define TXD_TEXTURE 0x15
#define TXD_TEXTURE_DATA 0x01
#define TXD_MARKER 0x1803ffff
#define TXD_MARKER2 0x1003ffff
static int txd_probe(AVProbeData * pd) {
if (AV_RL32(pd->buf ) == TXD_FILE &&
(AV_RL32(pd->buf+8) == TXD_MARKER || AV_RL32(pd->buf+8) == TXD_MARKER2))
return AVPROBE_SCORE_MAX;
return 0;
}
static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) {
AVStream *st;
st = avformat_new_stream(s, NULL);
if (!st)
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;
/* the parameters will be extracted from the compressed bitstream */
return 0;
}
static int txd_read_packet(AVFormatContext *s, AVPacket *pkt) {
AVIOContext *pb = s->pb;
unsigned int id, chunk_size, marker;
int ret;
next_chunk:
id = avio_rl32(pb);
chunk_size = avio_rl32(pb);
marker = avio_rl32(pb);
if (s->pb->eof_reached)
return AVERROR_EOF;
if (marker != TXD_MARKER && marker != TXD_MARKER2) {
av_log(s, AV_LOG_ERROR, "marker does not match\n");
return AVERROR_INVALIDDATA;
}
switch (id) {
case TXD_INFO:
if (chunk_size > 100)
break;
case TXD_EXTRA:
avio_skip(s->pb, chunk_size);
case TXD_FILE:
case TXD_TEXTURE:
goto next_chunk;
default:
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 0;
}
AVInputFormat ff_txd_demuxer = {
.name = "txd",
.long_name = NULL_IF_CONFIG_SMALL("Renderware TeXture Dictionary"),
.read_probe = txd_probe,
.read_header = txd_read_header,
.read_packet = txd_read_packet,
};
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...