mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 00:06:36 +00:00
ext/ffmpeg/gstffmpegcodecmap.c: Set property incompatible with DV demuxer so that it won't infinitely plug demuxers t...
Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), (gst_ffmpeg_caps_to_codecid): Set property incompatible with DV demuxer so that it won't infinitely plug demuxers to each other. Fixes playback of .dv streams in Totem.
This commit is contained in:
parent
e21d8a6fe0
commit
4009d4d7bf
2 changed files with 18 additions and 3 deletions
|
@ -1,3 +1,11 @@
|
|||
2005-01-06 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
||||
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
|
||||
(gst_ffmpeg_caps_to_codecid):
|
||||
Set property incompatible with DV demuxer so that it won't
|
||||
infinitely plug demuxers to each other. Fixes playback of .dv
|
||||
streams in Totem.
|
||||
|
||||
2004-12-27 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
||||
* configure.ac:
|
||||
|
|
|
@ -332,7 +332,9 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
|
|||
break;
|
||||
|
||||
case CODEC_ID_DVVIDEO:
|
||||
caps = GST_FF_VID_CAPS_NEW ("video/x-dv", NULL);
|
||||
caps = GST_FF_VID_CAPS_NEW ("video/x-dv",
|
||||
"systemstream", G_TYPE_BOOLEAN, FALSE,
|
||||
NULL);
|
||||
break;
|
||||
|
||||
case CODEC_ID_WMAV1:
|
||||
|
@ -1376,8 +1378,13 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
|
|||
id = CODEC_ID_PCM_ALAW;
|
||||
audio = TRUE;
|
||||
} else if (!strcmp (mimetype, "video/x-dv")) {
|
||||
id = CODEC_ID_DVVIDEO;
|
||||
video = TRUE;
|
||||
gboolean sys_strm;
|
||||
|
||||
if (!gst_structure_get_boolean (structure, "systemstream", &sys_strm) &&
|
||||
!sys_strm) {
|
||||
id = CODEC_ID_DVVIDEO;
|
||||
video = TRUE;
|
||||
}
|
||||
} else if (!strcmp (mimetype, "audio/x-dv")) { /* ??? */
|
||||
id = CODEC_ID_DVAUDIO;
|
||||
audio = TRUE;
|
||||
|
|
Loading…
Reference in a new issue