aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-19 22:50:17 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-19 22:50:17 +0000
commit9f5d3b13cf3be4d97515fac0542819060db69411 (patch)
tree7c808732419f5109c3d383149a901aa84a3dea4c /libavformat
parentd45bad6cef3f323966d505dfcabe4cbd6f48bc0a (diff)
downloadffmpeg-9f5d3b13cf3be4d97515fac0542819060db69411.tar.gz
ffm has no per stream priv_data anymore
Originally committed as revision 13832 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/ffmdec.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index e535e7d408..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;i<s->nb_streams;i++) {
st = s->streams[i];
if (st) {
- av_freep(&st->priv_data);
av_free(st);
}
}
@@ -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;i<s->nb_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,
};