diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 17:22:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 17:22:53 +0200 |
| commit | 0a41da3e9d2090c562b752d086bcbd4dee69c796 (patch) | |
| tree | b020af05513ba8d508a7d2d095b1ef904da93454 /libavformat | |
| parent | afe09e490a30c97aad6736f99d186634c354eb34 (diff) | |
| parent | d785f6940144eb6ce4c24309ed034056b81395bc (diff) | |
| download | ffmpeg-0a41da3e9d2090c562b752d086bcbd4dee69c796.tar.gz | |
Merge commit 'd785f6940144eb6ce4c24309ed034056b81395bc' into release/0.8
* commit 'd785f6940144eb6ce4c24309ed034056b81395bc':
shorten: validate that the channel count in the header is not <= 0
matroskadec: request a read buffer for the wav header
h264: check for luma and chroma bit depth being equal
xxan: fix invalid memory access in xan_decode_frame_type0()
wmadec: require block_align to be set.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index ad505f28b4..4b95abe1e4 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1402,7 +1402,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) && track->codec_priv.data != NULL) { int ret; ffio_init_context(&b, track->codec_priv.data, track->codec_priv.size, - AVIO_FLAG_READ, NULL, NULL, NULL, NULL); + 0, NULL, NULL, NULL, NULL); ret = ff_get_wav_header(&b, st->codec, track->codec_priv.size); if (ret < 0) return ret; |