git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ffm has no per stream priv_data anymore
[ffmpeg.git]
/
libavformat
/
ffmdec.c
diff --git
a/libavformat/ffmdec.c
b/libavformat/ffmdec.c
index
7f9cf9a
..
37a60a5
100644
(file)
--- 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) {
for(i=0;i<s->nb_streams;i++) {
st = s->streams[i];
if (st) {
- av_freep(&st->priv_data);
av_free(st);
}
}
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",
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);
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;
}
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 (
static int ffm_probe(AVProbeData *p)
{
if (
@@
-494,6
+481,6
@@
AVInputFormat ffm_demuxer = {
ffm_probe,
ffm_read_header,
ffm_read_packet,
ffm_probe,
ffm_read_header,
ffm_read_packet,
-
ffm_read_close
,
+
NULL
,
ffm_seek,
};
ffm_seek,
};