From: <rb...@fr...> - 2005-01-28 12:23:09
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: rbultje Date: Fri Jan 28 2005 04:23:07 PST Log message: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register): * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_register): Oops, unbreak audio. Modified files: . : ChangeLog ext/ffmpeg : gstffmpegdec.c gstffmpegenc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.130&r2=1.131 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c.diff?r1=1.87&r2=1.88 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegenc.c.diff?r1=1.59&r2=1.60 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- ChangeLog 28 Jan 2005 10:45:37 -0000 1.130 +++ ChangeLog 28 Jan 2005 12:22:54 -0000 1.131 @@ -1,5 +1,11 @@ 2005-01-28 Ronald S. Bultje <rb...@ro...> + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register): + * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_register): + Oops, unbreak audio. + +2005-01-28 Ronald S. Bultje <rb...@ro...> * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), (gst_ffmpeg_caps_to_codecid): Add AMR mimetypes (since those are recognized in ffmpeg). Index: gstffmpegdec.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- gstffmpegdec.c 28 Jan 2005 10:45:37 -0000 1.87 +++ gstffmpegdec.c 28 Jan 2005 12:22:54 -0000 1.88 @@ -897,7 +897,11 @@ /* first make sure we've got a supported type */ sinkcaps = gst_ffmpeg_codecid_to_caps (in_plugin->id, NULL, FALSE); - srccaps = gst_caps_from_string ("video/x-raw-rgb; video/x-raw-yuv"); + if (in_plugin->type == CODEC_TYPE_VIDEO) { + srccaps = gst_caps_from_string ("video/x-raw-rgb; video/x-raw-yuv"); + } else { + srccaps = gst_ffmpeg_codectype_to_caps (in_plugin->type, NULL); + } if (!sinkcaps || !srccaps) { if (sinkcaps) gst_caps_free (sinkcaps); if (srccaps) gst_caps_free (srccaps); Index: gstffmpegenc.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegenc.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- gstffmpegenc.c 28 Jan 2005 10:45:37 -0000 1.59 +++ gstffmpegenc.c 28 Jan 2005 12:22:54 -0000 1.60 @@ -708,7 +708,11 @@ srccaps = gst_ffmpeg_codecid_to_caps (in_plugin->id, NULL, TRUE); - sinkcaps = gst_caps_from_string ("video/x-raw-rgb; video/x-raw-yuv"); + sinkcaps = gst_caps_from_string ("video/x-raw-rgb; video/x-raw-yuv"); + sinkcaps = gst_ffmpeg_codectype_to_caps (in_plugin->type, NULL); if (!sinkcaps || !srccaps) goto next; |