virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

warn about zlib support needed if file has compressed moov atom

Browse Source 
Originally committed as revision 6747 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2006-10-20 13:06:50 +00:00
parent 864bc9656b
commit d966b2f0db
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/mov.c
View File

@ -1344,10 +1344,9 @@ static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
return err; return err;
} }
#ifdef CONFIG_ZLIB
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)
{ {
#ifdef CONFIG_ZLIB
ByteIOContext ctx; ByteIOContext ctx;
uint8_t *cmov_data; uint8_t *cmov_data;
uint8_t *moov_data; /* uncompressed data */ uint8_t *moov_data; /* uncompressed data */
@ -1389,10 +1388,12 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
ret = mov_read_default(c, &ctx, atom); ret = mov_read_default(c, &ctx, atom);
av_free(moov_data); av_free(moov_data);
av_free(cmov_data); av_free(cmov_data);
return ret; return ret;
} #else
av_log(c->fc, AV_LOG_ERROR, "this file requires zlib support compiled in\n");
return -1;
#endif #endif
}
/* edit list atom */ /* edit list atom */
static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
@ -1487,11 +1488,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = {
{ MKTAG( 't', 'c', 'm', 'd' ), mov_read_leaf }, { MKTAG( 't', 'c', 'm', 'd' ), mov_read_leaf },
{ MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */ { MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */
//{ MKTAG( 'r', 'm', 'q', 'u' ), mov_read_leaf }, //{ MKTAG( 'r', 'm', 'q', 'u' ), mov_read_leaf },
#ifdef CONFIG_ZLIB
{ MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov }, { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov },
#else
{ MKTAG( 'c', 'm', 'o', 'v' ), mov_read_leaf },
#endif
{ 0L, mov_read_leaf } { 0L, mov_read_leaf }
}; };