Mercurial > libavformat.hg
view ivfdec.c @ 6370:8b5aedaf23b2 libavformat
Fix segv when stream copy and validate_tag fails, st->codec->codec is not set
author | bcoudurier |
---|---|
date | Thu, 12 Aug 2010 00:35:19 +0000 |
parents | 817a86ec7ad2 |
children |
line wrap: on
line source
/* * Copyright (c) 2010 David Conrad * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" #include "riff.h" #include "libavutil/intreadwrite.h" static int probe(AVProbeData *p) { if (AV_RL32(p->buf) == MKTAG('D','K','I','F') && !AV_RL16(p->buf+4) && AV_RL16(p->buf+6) == 32) return AVPROBE_SCORE_MAX-2; return 0; } static int read_header(AVFormatContext *s, AVFormatParameters *ap) { AVStream *st; AVRational time_base; get_le32(s->pb); // DKIF get_le16(s->pb); // version get_le16(s->pb); // header size st = av_new_stream(s, 0); if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_tag = get_le32(s->pb); st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, st->codec->codec_tag); st->codec->width = get_le16(s->pb); st->codec->height = get_le16(s->pb); time_base.den = get_le32(s->pb); time_base.num = get_le32(s->pb); st->duration = get_le64(s->pb); st->need_parsing = AVSTREAM_PARSE_HEADERS; if (!time_base.den || !time_base.num) { av_log(s, AV_LOG_ERROR, "Invalid frame rate\n"); return AVERROR_INVALIDDATA; } av_set_pts_info(st, 64, time_base.num, time_base.den); return 0; } static int read_packet(AVFormatContext *s, AVPacket *pkt) { int ret, size = get_le32(s->pb); int64_t pts = get_le64(s->pb); ret = av_get_packet(s->pb, pkt, size); pkt->stream_index = 0; pkt->pts = pts; pkt->pos -= 12; return ret; } AVInputFormat ivf_demuxer = { "ivf", NULL_IF_CONFIG_SMALL("On2 IVF"), 0, probe, read_header, read_packet, .flags= AVFMT_GENERIC_INDEX, .codec_tag = (const AVCodecTag*[]){ff_codec_bmp_tags, 0}, };