From: <rb...@fr...> - 2005-04-23 16:07:51
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: rbultje Date: Sun Apr 24 2005 02:07:46 EST Log message: Reviewed by: Ronald S. Bultje <rb...@ro...> * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps): Don't crash if avcodec_open failed (#301717). Modified files: . : ChangeLog ext/ffmpeg : gstffmpegenc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.150&r2=1.151 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegenc.c.diff?r1=1.63&r2=1.64 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.150 retrieving revision 1.151 diff -u -d -r1.150 -r1.151 --- ChangeLog 21 Apr 2005 19:51:05 -0000 1.150 +++ ChangeLog 23 Apr 2005 16:07:34 -0000 1.151 @@ -1,3 +1,10 @@ +2005-04-23 Luca Ognibene <lu...@ti...> + + Reviewed by: Ronald S. Bultje <rb...@ro...> + * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps): + Don't crash if avcodec_open failed (#301717). 2005-04-21 Ronald S. Bultje <rb...@ro...> * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): Index: gstffmpegenc.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegenc.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- gstffmpegenc.c 21 Apr 2005 19:01:36 -0000 1.63 +++ gstffmpegenc.c 23 Apr 2005 16:07:34 -0000 1.64 @@ -331,9 +331,8 @@ caps = gst_caps_new_empty (); gst_caps_append (caps, gst_ffmpeg_codectype_to_caps (oclass->in_plugin->type, ctx)); + avcodec_close (ctx); } - /* FIXME: ffmpeg likes to crash on this */ - avcodec_close (ctx); } av_free (ctx); |