mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 22:36:33 +00:00
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.
This commit is contained in:
parent
37062fde79
commit
68331a35b5
3 changed files with 16 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2005-01-28 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
|
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
|
||||||
|
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_register):
|
||||||
|
Oops, unbreak audio.
|
||||||
|
|
||||||
2005-01-28 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
2005-01-28 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
|
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
|
||||||
|
|
|
@ -897,7 +897,11 @@ gst_ffmpegdec_register (GstPlugin * plugin)
|
||||||
|
|
||||||
/* first make sure we've got a supported type */
|
/* first make sure we've got a supported type */
|
||||||
sinkcaps = gst_ffmpeg_codecid_to_caps (in_plugin->id, NULL, FALSE);
|
sinkcaps = gst_ffmpeg_codecid_to_caps (in_plugin->id, NULL, FALSE);
|
||||||
|
if (in_plugin->type == CODEC_TYPE_VIDEO) {
|
||||||
srccaps = gst_caps_from_string ("video/x-raw-rgb; video/x-raw-yuv");
|
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 || !srccaps) {
|
||||||
if (sinkcaps) gst_caps_free (sinkcaps);
|
if (sinkcaps) gst_caps_free (sinkcaps);
|
||||||
if (srccaps) gst_caps_free (srccaps);
|
if (srccaps) gst_caps_free (srccaps);
|
||||||
|
|
|
@ -708,7 +708,11 @@ gst_ffmpegenc_register (GstPlugin * plugin)
|
||||||
|
|
||||||
/* first make sure we've got a supported type */
|
/* first make sure we've got a supported type */
|
||||||
srccaps = gst_ffmpeg_codecid_to_caps (in_plugin->id, NULL, TRUE);
|
srccaps = gst_ffmpeg_codecid_to_caps (in_plugin->id, NULL, TRUE);
|
||||||
|
if (in_plugin->type == CODEC_TYPE_VIDEO) {
|
||||||
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");
|
||||||
|
} else {
|
||||||
|
sinkcaps = gst_ffmpeg_codectype_to_caps (in_plugin->type, NULL);
|
||||||
|
}
|
||||||
if (!sinkcaps || !srccaps)
|
if (!sinkcaps || !srccaps)
|
||||||
goto next;
|
goto next;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue