Commit 6ba76932 authored by bcoudurier's avatar bcoudurier

ffm has no per stream priv_data anymore

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13832 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 84c0d6c5
...@@ -344,7 +344,6 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -344,7 +344,6 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
for(i=0;i<s->nb_streams;i++) { for(i=0;i<s->nb_streams;i++) {
st = s->streams[i]; st = s->streams[i];
if (st) { if (st) {
av_freep(&st->priv_data);
av_free(st); av_free(st);
} }
} }
...@@ -466,18 +465,6 @@ static int ffm_seek(AVFormatContext *s, int stream_index, int64_t wanted_pts, in ...@@ -466,18 +465,6 @@ static int ffm_seek(AVFormatContext *s, int stream_index, int64_t wanted_pts, in
return 0; return 0;
} }
static int ffm_read_close(AVFormatContext *s)
{
AVStream *st;
int i;
for(i=0;i<s->nb_streams;i++) {
st = s->streams[i];
av_freep(&st->priv_data);
}
return 0;
}
static int ffm_probe(AVProbeData *p) static int ffm_probe(AVProbeData *p)
{ {
if ( if (
...@@ -494,6 +481,6 @@ AVInputFormat ffm_demuxer = { ...@@ -494,6 +481,6 @@ AVInputFormat ffm_demuxer = {
ffm_probe, ffm_probe,
ffm_read_header, ffm_read_header,
ffm_read_packet, ffm_read_packet,
ffm_read_close, NULL,
ffm_seek, ffm_seek,
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment