diff --git a/ChangeLog b/ChangeLog index ee06466c09..4d7a1766e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-18 Andy Wingo + + * ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_sink_event): Only drain + if we've already set up a codec. + 2008-03-17 Andy Wingo * ext/ffmpeg/Makefile.am (libgstffmpeg_la_LIBADD): Re-add -lz diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index bb6b32d192..9ef013e400 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -2048,7 +2048,8 @@ gst_ffmpegdec_sink_event (GstPad * pad, GstEvent * event) /* drain pending frames before trying to use the new segment, queued * buffers belonged to the previous segment. */ - gst_ffmpegdec_drain (ffmpegdec); + if (ffmpegdec->context->codec) + gst_ffmpegdec_drain (ffmpegdec); GST_DEBUG_OBJECT (ffmpegdec, "NEWSEGMENT in time start %" GST_TIME_FORMAT " -- stop %"