diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:33:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:34:05 +0100 |
| commit | 4cd4a6de4f976a5bf79b564daa23c97cce545caf (patch) | |
| tree | d0aa23553a479abf04ba24cbd3fcf53f2d48db58 | |
| parent | cdbebae44440bea97f300f256d722c1495753bc2 (diff) | |
| parent | 2007082d2db25f9305b8a345798b840ea7784fdb (diff) | |
| download | ffmpeg-4cd4a6de4f976a5bf79b564daa23c97cce545caf.tar.gz | |
Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'
* commit '2007082d2db25f9305b8a345798b840ea7784fdb':
mov: check ff_get_wav_header() return value
Conflicts:
libavformat/mov.c
See: 6d55a40b00801899f7975b22401bdd96bbc228af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 8bf16e7a36..d65e40f009 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -691,16 +691,16 @@ static int mov_read_chan(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_wfex(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; + int ret; if (c->fc->nb_streams < 1) return 0; st = c->fc->streams[c->fc->nb_streams-1]; - if (ff_get_wav_header(pb, st->codec, atom.size) < 0) { + if ((ret = ff_get_wav_header(pb, st->codec, atom.size)) < 0) av_log(c->fc, AV_LOG_WARNING, "get_wav_header failed\n"); - } - return 0; + return ret; } static int mov_read_pasp(MOVContext *c, AVIOContext *pb, MOVAtom atom) |