mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/gstffmpegcodecmap.c: Set property incompatible with DV demuxer so that it won't infinitely plug demuxers t...

Browse source 
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:
Ronald S. Bultje 2005-01-06 10:28:18 +00:00
parent e21d8a6fe0
commit 4009d4d7bf
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2004-12-27 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* configure.ac: * configure.ac:

9
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -332,7 +332,9 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break; break;
case CODEC_ID_DVVIDEO: 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; break;
case CODEC_ID_WMAV1: case CODEC_ID_WMAV1:
@ -1376,8 +1378,13 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
id = CODEC_ID_PCM_ALAW; id = CODEC_ID_PCM_ALAW;
audio = TRUE; audio = TRUE;
} else if (!strcmp (mimetype, "video/x-dv")) { } else if (!strcmp (mimetype, "video/x-dv")) {
gboolean sys_strm;
if (!gst_structure_get_boolean (structure, "systemstream", &sys_strm) &&
!sys_strm) {
id = CODEC_ID_DVVIDEO; id = CODEC_ID_DVVIDEO;
video = TRUE; video = TRUE;
}
} else if (!strcmp (mimetype, "audio/x-dv")) { /* ??? */ } else if (!strcmp (mimetype, "audio/x-dv")) { /* ??? */
id = CODEC_ID_DVAUDIO; id = CODEC_ID_DVAUDIO;
audio = TRUE; audio = TRUE;