RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

VP3/Theora: validate aspect and reduce it before exporting it 

via the context.

Originally committed as revision 25050 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2010-09-06 17:53:29 +00:00
parent 1b4d327b1c
commit 6974952d24
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/vp3.c
View File

@ -1965,7 +1965,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
Vp3DecodeContext *s = avctx->priv_data; Vp3DecodeContext *s = avctx->priv_data;
int visible_width, visible_height, colorspace; int visible_width, visible_height, colorspace;
int offset_x = 0, offset_y = 0; int offset_x = 0, offset_y = 0;
AVRational fps; AVRational fps, aspect;
s->theora = get_bits_long(gb, 24); s->theora = get_bits_long(gb, 24);
av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora); av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
@ -2002,8 +2002,13 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
fps.den, fps.num, 1<<30); fps.den, fps.num, 1<<30);
} }
avctx->sample_aspect_ratio.num = get_bits_long(gb, 24); aspect.num = get_bits_long(gb, 24);
avctx->sample_aspect_ratio.den = get_bits_long(gb, 24); aspect.den = get_bits_long(gb, 24);
if (aspect.num && aspect.den) {
av_reduce(&avctx->sample_aspect_ratio.num,
&avctx->sample_aspect_ratio.den,
aspect.num, aspect.den, 1<<30);
}
if (s->theora < 0x030200) if (s->theora < 0x030200)
skip_bits(gb, 5); /* keyframe frequency force */ skip_bits(gb, 5); /* keyframe frequency force */