diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-10-19 10:05:36 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-10-19 10:05:36 +0000 |
| commit | 143bf7d7c30c10033c4d90ab6c4b497582f46653 (patch) | |
| tree | 82d1115968c5b4859d8fbfba32c7836232f5b87e | |
| parent | ebd624b66256c93f66fa8d86a22fa50a3566ffd2 (diff) | |
| download | ffmpeg-143bf7d7c30c10033c4d90ab6c4b497582f46653.tar.gz | |
dont mess with ByteIOContext internal variables (fixes showdown2.mov)
Originally committed as revision 6733 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 09d8cd75a3..f02f8c89ef 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1348,7 +1348,7 @@ static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) #ifdef CONFIG_ZLIB static int null_read_packet(void *opaque, uint8_t *buf, int buf_size) { - return -1; + return buf_size; } static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) @@ -1385,7 +1385,6 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) return -1; if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, null_read_packet, NULL, NULL) != 0) return -1; - ctx.buf_end = ctx.buffer + moov_len; atom.type = MKTAG( 'm', 'o', 'o', 'v' ); atom.offset = 0; atom.size = moov_len; |