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/dxa.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/dxa.c')
| -rw-r--r-- | libavformat/dxa.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/dxa.c b/libavformat/dxa.c index cf93df70d4..15147a7a8d 100644 --- a/libavformat/dxa.c +++ b/libavformat/dxa.c @@ -60,6 +60,7 @@ static int dxa_read_header(AVFormatContext *s, AVFormatParameters *ap) int w, h; int num, den; int flags; + int ret; tag = avio_rl32(pb); if (tag != MKTAG('D', 'E', 'X', 'A')) @@ -102,7 +103,9 @@ static int dxa_read_header(AVFormatContext *s, AVFormatParameters *ap) ast = av_new_stream(s, 0); if (!ast) return -1; - ff_get_wav_header(pb, ast->codec, fsize); + ret = ff_get_wav_header(pb, ast->codec, fsize); + if (ret < 0) + return ret; // find 'data' chunk while(avio_tell(pb) < c->vidpos && !url_feof(pb)){ tag = avio_rl32(pb); |