diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-15 04:37:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-15 04:50:06 +0200 |
| commit | 85b21147594101ba2d8e7ea2cfa504c0d1baee5a (patch) | |
| tree | 62927788e459965cea1ff4cd23c219fcf0410b0e /libavformat/wtv.c | |
| parent | 256c5b08bf09cb6403790d731cc1c771d8fb0e94 (diff) | |
| parent | a3a0af4fb1237bed0af75868073f9a63db8b1864 (diff) | |
| download | ffmpeg-85b21147594101ba2d8e7ea2cfa504c0d1baee5a.tar.gz | |
Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'
* commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864':
avutil: make aes and sha api public
handle malloc failures in ff_get_wav_header
add xWMA demuxer
mpegts: force the default timebase
libavcodec: Bump micro after adding the dtx AVOptions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtv.c')
| -rw-r--r-- | libavformat/wtv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/wtv.c b/libavformat/wtv.c index 756ba93e7a..795ea39bf9 100644 --- a/libavformat/wtv.c +++ b/libavformat/wtv.c @@ -645,7 +645,9 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, if (!st) return NULL; if (!ff_guidcmp(formattype, format_waveformatex)) { - ff_get_wav_header(pb, st->codec, size); + int ret = ff_get_wav_header(pb, st->codec, size); + if (ret < 0) + return NULL; } else { if (ff_guidcmp(formattype, format_none)) av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype)); |