From: <bi...@ke...> - 2006-06-02 13:41:37
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: bilboed Date: Fri Jun 02 2006 12:38:49 UTC Log message: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_chain): Nothing to see, pass your way, I didn't screwup the previous commit. Modified files: . : ChangeLog ext/ffmpeg : gstffmpegdec.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.304&r2=1.305 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c.diff?r1=1.152&r2=1.153 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.304 retrieving revision 1.305 diff -u -d -r1.304 -r1.305 --- ChangeLog 2 Jun 2006 12:29:38 -0000 1.304 +++ ChangeLog 2 Jun 2006 12:38:37 -0000 1.305 @@ -1,5 +1,10 @@ 2006-06-02 Edward Hervey <ed...@fl...> + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_chain): + Nothing to see, pass your way, I didn't screwup the previous commit. + +2006-06-02 Edward Hervey <ed...@fl...> * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_init), (gst_ffmpegdec_query), (gst_ffmpegdec_update_qos), (gst_ffmpegdec_reset_qos), (gst_ffmpegdec_read_qos), Index: gstffmpegdec.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c,v retrieving revision 1.152 retrieving revision 1.153 diff -u -d -r1.152 -r1.153 --- gstffmpegdec.c 2 Jun 2006 12:29:38 -0000 1.152 +++ gstffmpegdec.c 2 Jun 2006 12:38:37 -0000 1.153 @@ -1679,7 +1679,6 @@ gint res; gint64 ffpts; - dump_parser_context (ffmpegdec->pctx, ffmpegdec->context); GST_LOG_OBJECT (ffmpegdec, "Calling av_parser_parse with ts:%" GST_TIME_FORMAT, GST_TIME_ARGS (in_ts)); @@ -1694,8 +1693,6 @@ "Parsed video frame, res=%d, size=%d, data=%p, in_ts:%" GST_TIME_FORMAT, res, size, data, GST_TIME_ARGS (in_ts)); - if (res == 0 || size == 0) { GST_LOG_OBJECT (ffmpegdec, "parser returned null res or size, breaking"); |