X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavformat%2Fffmdec.c;h=37a60a55e5675c876c7622da7c72697568e318fc;hp=7f9cf9a853a0435a6a309bc644c002b103771825;hb=9f5d3b13cf3be4d97515fac0542819060db69411;hpb=3c6a9f66b9b46a158ce6ddb74637f8298d7ab4da diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 7f9cf9a853..37a60a55e5 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -344,7 +344,6 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) for(i=0;inb_streams;i++) { st = s->streams[i]; if (st) { - av_freep(&st->priv_data); av_free(st); } } @@ -364,7 +363,7 @@ static int ffm_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EAGAIN); } dprintf(s, "pos=%08"PRIx64" spos=%"PRIx64", write_index=%"PRIx64" size=%"PRIx64"\n", - url_ftell(s->pb), s->pb.pos, ffm->write_index, ffm->file_size); + url_ftell(s->pb), s->pb->pos, ffm->write_index, ffm->file_size); if (ffm_read_data(s, ffm->header, FRAME_HEADER_SIZE, 1) != FRAME_HEADER_SIZE) return AVERROR(EAGAIN); @@ -466,18 +465,6 @@ static int ffm_seek(AVFormatContext *s, int stream_index, int64_t wanted_pts, in return 0; } -static int ffm_read_close(AVFormatContext *s) -{ - AVStream *st; - int i; - - for(i=0;inb_streams;i++) { - st = s->streams[i]; - av_freep(&st->priv_data); - } - return 0; -} - static int ffm_probe(AVProbeData *p) { if ( @@ -494,6 +481,6 @@ AVInputFormat ffm_demuxer = { ffm_probe, ffm_read_header, ffm_read_packet, - ffm_read_close, + NULL, ffm_seek, };