From 68331a35b5ea4f338ef207d58074eeb5df539c8c Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 28 Jan 2005 12:22:54 +0000 Subject: [PATCH] ext/ffmpeg/: Oops, unbreak audio. Original commit message from CVS: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register): * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_register): Oops, unbreak audio. --- ChangeLog | 6 ++++++ ext/ffmpeg/gstffmpegdec.c | 6 +++++- ext/ffmpeg/gstffmpegenc.c | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74b05668bf..6eecbf8c2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-01-28 Ronald S. Bultje + + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register): + * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_register): + Oops, unbreak audio. + 2005-01-28 Ronald S. Bultje * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 291866bfcd..17f242cf86 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -897,7 +897,11 @@ gst_ffmpegdec_register (GstPlugin * plugin) /* 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); diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c index a528f49576..15e86629a1 100644 --- a/ext/ffmpeg/gstffmpegenc.c +++ b/ext/ffmpeg/gstffmpegenc.c @@ -708,7 +708,11 @@ gst_ffmpegenc_register (GstPlugin * plugin) /* first make sure we've got a supported type */ srccaps = gst_ffmpeg_codecid_to_caps (in_plugin->id, NULL, TRUE); - sinkcaps = gst_caps_from_string ("video/x-raw-rgb; video/x-raw-yuv"); + if (in_plugin->type == CODEC_TYPE_VIDEO) { + sinkcaps = gst_caps_from_string ("video/x-raw-rgb; video/x-raw-yuv"); + } else { + sinkcaps = gst_ffmpeg_codectype_to_caps (in_plugin->type, NULL); + } if (!sinkcaps || !srccaps) goto next;