Commit 143bf7d7 authored by Michael Niedermayer's avatar Michael Niedermayer

dont mess with ByteIOContext internal variables (fixes showdown2.mov)

Originally committed as revision 6733 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ebd624b6
...@@ -1348,7 +1348,7 @@ static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) ...@@ -1348,7 +1348,7 @@ static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
static int null_read_packet(void *opaque, uint8_t *buf, int buf_size) 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) 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) ...@@ -1385,7 +1385,6 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
return -1; return -1;
if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, null_read_packet, NULL, NULL) != 0) if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, null_read_packet, NULL, NULL) != 0)
return -1; return -1;
ctx.buf_end = ctx.buffer + moov_len;
atom.type = MKTAG( 'm', 'o', 'o', 'v' ); atom.type = MKTAG( 'm', 'o', 'o', 'v' );
atom.offset = 0; atom.offset = 0;
atom.size = moov_len; atom.size = moov_len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment