From 7d7f3618a49cee43da2513be1a877a1efd47046c Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 17 Dec 2004 13:56:18 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdec.c: Small parsing fix in comb. with ffdemux_mpeg. Original commit message from CVS: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_chain): Small parsing fix in comb. with ffdemux_mpeg. --- ChangeLog | 5 +++++ ext/ffmpeg/gstffmpegdec.c | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90c03d1..50e6460 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-12-17 Ronald S. Bultje + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_chain): + Small parsing fix in comb. with ffdemux_mpeg. + +2004-12-17 Ronald S. Bultje + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_init), (gst_ffmpegdec_close), (gst_ffmpegdec_open), (gst_ffmpegdec_chain): Include optional parser if supported (currently only MPEG-1/-2 diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index e1a52a0..4d95542 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -498,12 +498,9 @@ gst_ffmpegdec_chain (GstPad * pad, GstData * _data) expected_ts / (GST_SECOND / AV_TIME_BASE), expected_ts / (GST_SECOND / AV_TIME_BASE)); - if (res == 0) + if (res == 0 || size == 0) break; - else if (size == 0) { - bsize = 0; - break; - } else { + else { bsize -= res; bdata += res; } -- 2.7.4