diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-10-20 09:32:48 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-10-20 09:32:48 +0000 |
| commit | 942f3bb528807df5f272a7577a2a3813fe18b848 (patch) | |
| tree | 5799e010f078dc2df523f0b9704d4c53ddd14700 /libavformat/mov.c | |
| parent | d3e7c5c35be22adb9964a25c434cf3f2f3ea816d (diff) | |
| download | ffmpeg-942f3bb528807df5f272a7577a2a3813fe18b848.tar.gz | |
move memory reading ByteIOContext init from mov.c to avobuf.c
Originally committed as revision 6744 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index f02f8c89ef..0f3720a01c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1346,11 +1346,6 @@ 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 buf_size; -} - static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { ByteIOContext ctx; @@ -1383,7 +1378,7 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) get_buffer(pb, cmov_data, cmov_len); if(uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK) 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, NULL, NULL) != 0) return -1; atom.type = MKTAG( 'm', 'o', 'o', 'v' ); atom.offset = 0; |