aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/ffmdec.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-07 00:49:03 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-07 00:49:03 +0000
commit2940b38ef2488f3ad84421cab0f7dc1c13f043fb (patch)
tree5219f9b014e14ef939d57ee0e92c7409ad4e6b3c /libavformat/ffmdec.c
parentc07d64c8900e845271f81285968d0791613ff6c7 (diff)
downloadffmpeg-2940b38ef2488f3ad84421cab0f7dc1c13f043fb.tar.gz
fix pts handling in ffm
Originally committed as revision 13683 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/ffmdec.c')
-rw-r--r--libavformat/ffmdec.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 9e1d57f3d2..9c0ea89eb4 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -232,7 +232,6 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
FFMContext *ffm = s->priv_data;
AVStream *st;
- FFMStream *fst;
ByteIOContext *pb = s->pb;
AVCodecContext *codec;
int i, nb_streams;
@@ -263,15 +262,10 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
st = av_new_stream(s, 0);
if (!st)
goto fail;
- fst = av_mallocz(sizeof(FFMStream));
- if (!fst)
- goto fail;
s->streams[i] = st;
av_set_pts_info(st, 64, 1, 1000000);
- st->priv_data = fst;
-
codec = st->codec;
/* generic info */
codec->codec_id = get_be32(pb);