ext/ogg/gstoggmux.c: Basic pad template which accepts OGM tracks, speex, flac, vorbis...

Original commit message from CVS:
* ext/ogg/gstoggmux.c:
Basic pad template which accepts OGM tracks, speex, flac, vorbis
and theora. Any is incorrect.
* gst/asfdemux/gstasfmux.c: (gst_asfmux_vidsink_link):
Fix caps.
* sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_base_init):
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_base_init),
(gst_v4lmjpegsrc_init), (gst_v4lmjpegsrc_srcconnect),
(gst_v4lmjpegsrc_getcaps), (gst_v4lmjpegsrc_change_state):
* sys/v4l/gstv4lmjpegsrc.h:
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_src_link), (gst_v4lsrc_getcaps),
(gst_v4lsrc_change_state):
* sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_capture_start),
(gst_v4lmjpegsrc_capture_stop):
Fix caps. Keep track of internal state. Work.

diff --git a/ChangeLog b/ChangeLog
index 55f0425..cd3e470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-10-24  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * ext/ogg/gstoggmux.c:
+         Basic pad template which accepts OGM tracks, speex, flac, vorbis
+         and theora. Any is incorrect.
+       * gst/asfdemux/gstasfmux.c: (gst_asfmux_vidsink_link):
+         Fix caps.
+       * sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_base_init):
+       * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_base_init),
+       (gst_v4lmjpegsrc_init), (gst_v4lmjpegsrc_srcconnect),
+       (gst_v4lmjpegsrc_getcaps), (gst_v4lmjpegsrc_change_state):
+       * sys/v4l/gstv4lmjpegsrc.h:
+       * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_src_link), (gst_v4lsrc_getcaps),
+       (gst_v4lsrc_change_state):
+       * sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_capture_start),
+       (gst_v4lmjpegsrc_capture_stop):
+         Fix caps. Keep track of internal state. Work.
+
 2004-10-23  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
        * ext/Makefile.am:

diff --git a/gst/asfdemux/gstasfmux.c b/gst/asfdemux/gstasfmux.c
index bc1db1b..adc4ad6 100644 (file)
--- a/gst/asfdemux/gstasfmux.c
+++ b/gst/asfdemux/gstasfmux.c
@@ -84,7 +84,7 @@ static GstStaticPadTemplate gst_asfmux_videosink_template =
         "format = (fourcc) { YUY2, I420 }, "
         "width = (int) [ 1, MAX], "
         "height = (int) [ 1, MAX]; "
-        "video/x-jpeg, "
+        "image/jpeg, "
         "width = (int) [ 1, MAX], "
         "height = (int) [ 1, MAX]; "
         "video/x-divx, "
@@ -316,7 +316,7 @@ gst_asfmux_vidsink_link (GstPad * pad, const GstCaps * caps)
     /* find format */
     if (!strcmp (mimetype, "video/x-huffyuv")) {
       stream->header.video.format.tag = GST_MAKE_FOURCC ('H', 'F', 'Y', 'U');
-    } else if (!strcmp (mimetype, "video/x-jpeg")) {
+    } else if (!strcmp (mimetype, "image/jpeg")) {
       stream->header.video.format.tag = GST_MAKE_FOURCC ('M', 'J', 'P', 'G');
     } else if (!strcmp (mimetype, "video/x-divx")) {
       gint divxversion;