diff options
| author | Alex Sukhanov <alx.sukhanov@gmail.com> | 2014-05-14 12:10:16 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 03:43:37 +0200 |
| commit | 8b96f31817be57f0542834e7d6bdaecf2db6fd50 (patch) | |
| tree | 0ac5495b20a5ca8d381f469decf5a3d865d15a88 /libavformat/mov.c | |
| parent | 09cd22860fefef50d9bcb32b1bd9806d860980e2 (diff) | |
| download | ffmpeg-8b96f31817be57f0542834e7d6bdaecf2db6fd50.tar.gz | |
libavformat/mov: Elimitate double reading of COVR metadata if MOV_EXPORT_ALL_METADATA is enabled
Problem: ffmpeg tries to read COVR atom data twice if MOV_EXPORT_ALL_METADATA is enabled.
If COVR atom is the last in the stream, a parsing of such file fails.
Solution: just return immediatelly after mov_read_covr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index ff85a1ffec..b0500d9756 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -295,8 +295,8 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) int ret = mov_read_covr(c, pb, data_type, str_size); if (ret < 0) { av_log(c->fc, AV_LOG_ERROR, "Error parsing cover art.\n"); - return ret; } + return ret; } } else return 0; } else if (atom.size > 4 && key && !c->itunes_metadata) { |