diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-08-13 00:44:35 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-08-13 00:44:35 +0000 |
| commit | a985a940c034fd6dbe61c058c853cbe7d2c6c7a3 (patch) | |
| tree | 245fd38ec2db8ac83718db2eedbfd6f18c30b4ef /libavformat | |
| parent | b74fb935f814779826333a8bdb03dcbc3135835f (diff) | |
| download | ffmpeg-a985a940c034fd6dbe61c058c853cbe7d2c6c7a3.tar.gz | |
export 4xm video version
Originally committed as revision 10092 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/4xm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 4c52f8a0e6..94bd025c08 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -138,7 +138,6 @@ static int fourxm_read_header(AVFormatContext *s, } fourxm->width = AV_RL32(&header[i + 36]); fourxm->height = AV_RL32(&header[i + 40]); - i += 8 + size; /* allocate a new AVStream */ st = av_new_stream(s, 0); @@ -150,10 +149,11 @@ static int fourxm_read_header(AVFormatContext *s, st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_4XM; - st->codec->codec_tag = 0; /* no fourcc */ + st->codec->codec_tag = AV_RL32(&header[i + 16]); st->codec->width = fourxm->width; st->codec->height = fourxm->height; + i += 8 + size; } else if (fourcc_tag == strk_TAG) { /* check that there is enough data */ if (size != strk_SIZE) { |