summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Loeuillet <gstreamer@leroutier.net>2005-01-07 22:42:32 +0000
committerStéphane Loeuillet <gstreamer@leroutier.net>2005-01-07 22:42:32 +0000
commit3a37a6bc0d8344b842b7e9b9ea40883bae979323 (patch)
tree8ee58000169ef91bb097ddedcdf2a62c1de8ec41
parentae84e29ad1515690cdd87cb3e6177828c875056c (diff)
ext/dv/demo-play.c: xvideosink -> xvimagesink
Original commit message from CVS: * ext/dv/demo-play.c: (main): xvideosink -> xvimagesink * ext/dv/gstdvdec.c: change rgb 32/32 caps to 24/32 (no alpha) change nb of channels to be a list (2 or 4, not 2) change sample rate to be a list (32, 44.1, 48 kHz) not a range * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_ext_content_desc): Add 'date/year' to extracted metadata list
-rw-r--r--ChangeLog15
-rw-r--r--ext/dv/demo-play.c2
-rw-r--r--ext/dv/gstdvdec.c6
3 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 77356856..fd7ec73e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-01-07 Stephane LOEUILLET <stephane.loeuillet@tiscali.fr>
+
+ * ext/dv/demo-play.c: (main):
+ xvideosink -> xvimagesink
+ * ext/dv/gstdvdec.c:
+ change rgb 32/32 caps to 24/32 (no alpha)
+ change nb of channels to be a list (2 or 4, not 2)
+ change sample rate to be a list (32, 44.1, 48 kHz) not a range
+ * gst/asfdemux/gstasfdemux.c:
+ (gst_asf_demux_process_ext_content_desc):
+ Add 'date/year' to extracted metadata list
+
2005-01-07 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_fixate):
@@ -79,7 +91,6 @@
* gst/asfdemux/gstasfdemux.c:
(gst_asf_demux_process_ext_content_desc):
Extract TrackNumber metadata + clean up code
-
* gst/games/gstvideoimage.c: (gst_video_image_draw_rectangle):
Hope this is the good fix (var used unitialised)
@@ -105,7 +116,6 @@
* configure.ac:
don't compile faad plugin if a RC of 2.0 is found
Fixes #155346 (and FC1 buildbot)
-
* gst/asfdemux/gstasfdemux.c:
(gst_asf_demux_process_ext_content_desc):
try to make Solaris compiler happier
@@ -127,7 +137,6 @@
* gst-libs/gst/riff/riff-ids.h:
* gst/wavenc/riff.h:
Add AMR (VBR and CBR) ids to riff.h audio codec list
-
* gst/asfdemux/gstasfdemux.c:
(gst_asf_demux_process_ext_content_desc),
(gst_asf_demux_process_object):
diff --git a/ext/dv/demo-play.c b/ext/dv/demo-play.c
index cf27283e..a4114977 100644
--- a/ext/dv/demo-play.c
+++ b/ext/dv/demo-play.c
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
fprintf (stderr, "no dvdec\n"), exit (1);
/* cspace = gst_element_factory_make ("colorspace", "cspace"); */
deint = gst_element_factory_make ("deinterlace", "deinterlace");
- videosink = gst_element_factory_make ("xvideosink", "videosink");
+ videosink = gst_element_factory_make ("xvimagesink", "videosink");
if (!videosink)
fprintf (stderr, "no dvdec\n"), exit (1);
g_object_set (G_OBJECT (videosink), "width", 720, "height", 576, NULL);
diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c
index dbfbe5b3..fe5c101b 100644
--- a/ext/dv/gstdvdec.c
+++ b/ext/dv/gstdvdec.c
@@ -121,7 +121,7 @@ static GstStaticPadTemplate video_src_temp = GST_STATIC_PAD_TEMPLATE ("video",
//" }; "
"video/x-raw-rgb, "
"bpp = (int) 32, "
- "depth = (int) 32, "
+ "depth = (int) 24, "
"endianness = (int) " G_STRINGIFY (G_BIG_ENDIAN) ", "
"red_mask = (int) 0x00ff0000, "
"green_mask = (int) 0x0000ff00, "
@@ -169,9 +169,9 @@ static GstStaticPadTemplate audio_src_temp = GST_STATIC_PAD_TEMPLATE ("audio",
"depth = (int) 16, "
"width = (int) 16, "
"signed = (boolean) TRUE, "
- "channels = (int) 2, "
+ "channels = (int) {2, 4}"
"endianness = (int) " G_STRINGIFY (G_LITTLE_ENDIAN) ", "
- "rate = (int) [ 4000, 48000 ]")
+ "rate = (int) { 32000, 44100, 48000}")
);
#define GST_TYPE_DVDEC_QUALITY (gst_dvdec_quality_get_type())