diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-02 01:51:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-02 01:54:27 +0200 |
| commit | 4defa68fe25eae4d7c27341e3b35811c047dcd3f (patch) | |
| tree | 9d4d37343ec4c99801c1b76b813b0a5b2b04576b /libavformat/sierravmd.c | |
| parent | a2f5e14a867768019b49b830e29801f1bfb2abb7 (diff) | |
| parent | aa05f2126e18d23432bde77e6f44e41691472fef (diff) | |
| download | ffmpeg-4defa68fe25eae4d7c27341e3b35811c047dcd3f.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
ac3enc: ARM optimised ac3_compute_matissa_size
ac3: armv6 optimised bit_alloc_calc_bap
fate: simplify fft test rules
avio: document avio_alloc_context.
lavf: make compute_chapters_end less picky.
sierravmd: fix Indeo3 videos
FFT: simplify fft8()
fate: add fixed-point fft/mdct tests
Fixed-point support in fft-test
ape: check that number of seektable entries is equal to number of frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sierravmd.c')
| -rw-r--r-- | libavformat/sierravmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index 0fa1142c0b..64836e214b 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -99,7 +99,7 @@ static int vmd_read_header(AVFormatContext *s, if (avio_read(pb, vmd->vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE) return AVERROR(EIO); - if(vmd->vmd_header[16] == 'i' && vmd->vmd_header[17] == 'v' && vmd->vmd_header[18] == '3') + if(vmd->vmd_header[24] == 'i' && vmd->vmd_header[25] == 'v' && vmd->vmd_header[26] == '3') vmd->is_indeo3 = 1; else vmd->is_indeo3 = 0; @@ -249,7 +249,7 @@ static int vmd_read_packet(AVFormatContext *s, return AVERROR(ENOMEM); pkt->pos= avio_tell(pb); memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD); - if(vmd->is_indeo3) + if(vmd->is_indeo3 && frame->frame_record[0] == 0x02) ret = avio_read(pb, pkt->data, frame->frame_size); else ret = avio_read(pb, pkt->data + BYTES_PER_FRAME_RECORD, |