ffmpeg | branch: master | Timothy Gu <timothyg...@gmail.com> | Fri Nov 20 20:49:23 2015 -0800| [12a419dacb479d663f04e316f9997568ef326965] | committer: Timothy Gu
avformat/v210: Check width and height Fixes a floating point exception when width and height are not supplied (and therefore are zero). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12a419dacb479d663f04e316f9997568ef326965 --- libavformat/v210.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/libavformat/v210.c b/libavformat/v210.c index ab29171..31387a4 100644 --- a/libavformat/v210.c +++ b/libavformat/v210.c @@ -39,6 +39,7 @@ static int v210_read_header(AVFormatContext *ctx) { V210DemuxerContext *s = ctx->priv_data; AVStream *st; + int ret; st = avformat_new_stream(ctx, NULL); if (!st) @@ -50,11 +51,15 @@ static int v210_read_header(AVFormatContext *ctx) avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num); + ret = av_image_check_size(s->width, s->height, 0, ctx); + if (ret < 0) + return ret; st->codec->width = s->width; st->codec->height = s->height; st->codec->pix_fmt = ctx->iformat->raw_codec_id == AV_CODEC_ID_V210 ? AV_PIX_FMT_YUV422P10 : AV_PIX_FMT_YUV422P16; - st->codec->bit_rate = av_rescale_q(GET_PACKET_SIZE(s->width, s->height), + ctx->packet_size = GET_PACKET_SIZE(s->width, s->height); + st->codec->bit_rate = av_rescale_q(ctx->packet_size, (AVRational){8,1}, st->time_base); return 0; @@ -63,18 +68,10 @@ static int v210_read_header(AVFormatContext *ctx) static int v210_read_packet(AVFormatContext *s, AVPacket *pkt) { - int packet_size, ret, width, height; - AVStream *st = s->streams[0]; - - width = st->codec->width; - height = st->codec->height; - - packet_size = GET_PACKET_SIZE(width, height); - if (packet_size < 0) - return -1; + int ret; - ret = av_get_packet(s->pb, pkt, packet_size); - pkt->pts = pkt->dts = pkt->pos / packet_size; + ret = av_get_packet(s->pb, pkt, s->packet_size); + pkt->pts = pkt->dts = pkt->pos / s->packet_size; pkt->stream_index = 0; if (ret < 0) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
