Mercurial > libavformat.hg
changeset 1404:53803884feb7 libavformat
warn about zlib support needed if file has compressed moov atom
| author | bcoudurier |
|---|---|
| date | Fri, 20 Oct 2006 13:06:50 +0000 |
| parents | 1973528c6975 |
| children | f88bcfcc2f50 |
| files | mov.c |
| diffstat | 1 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mov.c Fri Oct 20 09:32:48 2006 +0000 +++ b/mov.c Fri Oct 20 13:06:50 2006 +0000 @@ -1344,10 +1344,9 @@ return err; } - -#ifdef CONFIG_ZLIB static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { +#ifdef CONFIG_ZLIB ByteIOContext ctx; uint8_t *cmov_data; uint8_t *moov_data; /* uncompressed data */ @@ -1389,10 +1388,12 @@ ret = mov_read_default(c, &ctx, atom); av_free(moov_data); av_free(cmov_data); - 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 */ static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) @@ -1487,11 +1488,7 @@ { MKTAG( 't', 'c', 'm', 'd' ), mov_read_leaf }, { MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */ //{ MKTAG( 'r', 'm', 'q', 'u' ), mov_read_leaf }, -#ifdef CONFIG_ZLIB { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov }, -#else -{ MKTAG( 'c', 'm', 'o', 'v' ), mov_read_leaf }, -#endif { 0L, mov_read_leaf } };