diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:36:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:36:39 +0100 |
| commit | 17596198cacbb7277f1d9641f0a76fe62ebf155d (patch) | |
| tree | 1c35aa3df1c1b2b92f942b5f83b3f80ea42d0ad5 /libavcodec | |
| parent | a003c5bd4ff1846edba0518306f8091c14041c96 (diff) | |
| parent | 80ac87c13dc8c6c063e26a464c5c542357c0583f (diff) | |
| download | ffmpeg-17596198cacbb7277f1d9641f0a76fe62ebf155d.tar.gz | |
Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'
* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
lavc: support ZenoXVID custom tag
libcdio: support recent cdio-paranoia
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
theora: Skip zero-sized headers
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/vp3.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 0232aa4c9d..8f1e4d3c9a 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -469,7 +469,7 @@ retry: if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){ if(s->stream_codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") || - s->codec_tag == AV_RL32("RMP4") || + s->codec_tag == AV_RL32("RMP4") || s->codec_tag == AV_RL32("ZMP4") || s->codec_tag == AV_RL32("SIPP") ) s->xvid_build= 0; diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index dcc2578b8f..ce3ffe832a 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2339,6 +2339,8 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) } for(i=0;i<3;i++) { + if (header_len[i] <= 0) + continue; init_get_bits(&gb, header_start[i], header_len[i] * 8); ptype = get_bits(&gb, 8); |