mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/divx/gstdivxenc.c: Use explicit caps - fix capsnego.

Browse source 
Original commit message from CVS:
2004-01-09  Ronald Bultje  <rbultje@ronald.bitfreak.net>

* ext/divx/gstdivxenc.c: (gst_divxenc_init):
Use explicit caps - fix capsnego.
* ext/xvid/gstxviddec.c:
* ext/xvid/gstxvidenc.c:
Remove macro-inside-macro which caused compile errors.
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_header):
Error out if it's not a RIFF file. Else we error out without
gst_element_error() which is not good...
This commit is contained in:
Ronald S. Bultje 2004-01-09 09:48:43 +00:00
parent d29c7c8c08
commit b5c817cb14
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2004-01-09 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/divx/gstdivxenc.c: (gst_divxenc_init):
Use explicit caps - fix capsnego.
* ext/xvid/gstxviddec.c:
* ext/xvid/gstxvidenc.c:
Remove macro-inside-macro which caused compile errors.
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_header):
Error out if it's not a RIFF file. Else we error out without
gst_element_error() which is not good...
2004-01-08 David Schleef <ds@schleef.org>
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect):

3
ext/divx/gstdivxenc.c
View file

@ -232,6 +232,7 @@ gst_divxenc_init (GstDivxEnc *divxenc)
divxenc->srcpad = gst_pad_new_from_template(
gst_static_pad_template_get (&src_template),
"src");
gst_pad_use_explicit_caps (divxenc->srcpad);
gst_element_add_pad(GST_ELEMENT(divxenc), divxenc->srcpad);
/* bitrate, etc. */
@ -456,7 +457,7 @@ gst_divxenc_connect (GstPad *pad,
"framerate", G_TYPE_DOUBLE, fps,
NULL);
ret = gst_pad_try_set_caps(divxenc->srcpad, new_caps);
ret = gst_pad_set_explicit_caps (divxenc->srcpad, new_caps);
if (ret <= 0) {
gst_divxenc_unset(divxenc);
}

2
ext/xvid/gstxviddec.c
View file

@ -55,9 +55,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_ALWAYS,
GST_STATIC_CAPS (
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; "
#ifdef XVID_CSP_ARGB
RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; "
#endif
RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; "
RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; "
RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; "

2
ext/xvid/gstxvidenc.c
View file

@ -43,9 +43,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_ALWAYS,
GST_STATIC_CAPS (
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; "
#ifdef XVID_CSP_ARGB
RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; "
#endif
RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; "
RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; "
RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; "

3
gst-libs/gst/riff/riff-read.c
View file

@ -845,7 +845,8 @@ gst_riff_read_header (GstRiffRead *riff,
if (!gst_riff_peek_head (riff, &tag, &length, NULL))
return FALSE;
if (tag != GST_RIFF_TAG_RIFF) {
GST_WARNING ("Not a RIFF file");
gst_element_error (GST_ELEMENT (riff),
"Not a RIFF file");
return FALSE;
}
gst_bytestream_flush_fast (riff->bs, 8);