diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-07 15:30:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-07 15:33:22 +0200 |
| commit | 0af8ed29e4a756c3e207ac65f479c23ca8ed025b (patch) | |
| tree | d4d8b3e7ccfe614fcd3afe34989514b24be890f9 /libavformat | |
| parent | a7908ac012ef60661765bda4550c02255d8265fd (diff) | |
| parent | f82e127dd9c7c0d54bf6400f83c7825e571f9a9e (diff) | |
| download | ffmpeg-0af8ed29e4a756c3e207ac65f479c23ca8ed025b.tar.gz | |
Merge commit 'f82e127dd9c7c0d54bf6400f83c7825e571f9a9e' into release/0.10
* commit 'f82e127dd9c7c0d54bf6400f83c7825e571f9a9e':
parser: fix large overreads
dsputil: fix invalid array indexing
shorten: use the unsigned type where needed
shorten: report meaningful errors
shorten: K&R formatting cosmetics
shorten: set invalid channels count to 0
matroskadec: request a read buffer for the wav header
h264: check for luma and chroma bit depth being equal
vc1: Move init code shared between decoder and parser to common code file.
libmp3lame: use the correct remaining buffer size when flushing
xxan: fix invalid memory access in xan_decode_frame_type0()
wmadec: require block_align to be set.
Conflicts:
libavcodec/h264.c
libavcodec/libmp3lame.c
libavcodec/shorten.c
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 2787a178c7..3cba90fd6d 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1463,7 +1463,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; |