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

ext/ogg/gstoggmux.c: Basic pad template which accepts OGM tracks, speex, flac, vorbis and theora. Any is incorrect.

Browse source 
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.
This commit is contained in:
Ronald S. Bultje 2004-10-24 13:41:18 +00:00
parent 89cb751a3d
commit 86a2f31ac8
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ChangeLog
View file

@ -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> 2004-10-23 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/Makefile.am: * ext/Makefile.am:

4
gst/asfdemux/gstasfmux.c
View file

@ -84,7 +84,7 @@ static GstStaticPadTemplate gst_asfmux_videosink_template =
"format = (fourcc) { YUY2, I420 }, " "format = (fourcc) { YUY2, I420 }, "
"width = (int) [ 1, MAX], " "width = (int) [ 1, MAX], "
"height = (int) [ 1, MAX]; " "height = (int) [ 1, MAX]; "
"video/x-jpeg, " "image/jpeg, "
"width = (int) [ 1, MAX], " "width = (int) [ 1, MAX], "
"height = (int) [ 1, MAX]; " "height = (int) [ 1, MAX]; "
"video/x-divx, " "video/x-divx, "
@ -316,7 +316,7 @@ gst_asfmux_vidsink_link (GstPad * pad, const GstCaps * caps)
/* find format */ /* find format */
if (!strcmp (mimetype, "video/x-huffyuv")) { if (!strcmp (mimetype, "video/x-huffyuv")) {
stream->header.video.format.tag = GST_MAKE_FOURCC ('H', 'F', 'Y', 'U'); 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'); stream->header.video.format.tag = GST_MAKE_FOURCC ('M', 'J', 'P', 'G');
} else if (!strcmp (mimetype, "video/x-divx")) { } else if (!strcmp (mimetype, "video/x-divx")) {
gint divxversion; gint divxversion;