ext/ffmpeg/gstffmpegenc.c: Negotiation fixes.

Original commit message from CVS:
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_init),
(gst_ffmpegenc_connect):  Negotiation fixes.
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_negotiate_format):
Remove inappropriate gst_caps_free().
* sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect):
Reenable Ronald's internal resize code, since the core handles
it correctly now.
This commit is contained in:
David Schleef 2004-01-02 23:11:41 +00:00
parent 88198262f5
commit 4c9ab8aa89
2 changed files with 12 additions and 2 deletions

View file

@ -1,3 +1,13 @@
2004-01-02 David Schleef <ds@schleef.org>
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_init),
(gst_ffmpegenc_connect): Negotiation fixes.
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_negotiate_format):
Remove inappropriate gst_caps_free().
* sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect):
Reenable Ronald's internal resize code, since the core handles
it correctly now.
2004-01-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_init):

View file

@ -588,11 +588,11 @@ gst_ximagesink_sinkconnect (GstPad *pad, const GstCaps *caps)
ximagesink->xwindow = gst_ximagesink_xwindow_new (ximagesink,
GST_VIDEOSINK_WIDTH (ximagesink),
GST_VIDEOSINK_HEIGHT (ximagesink));
/*else
else
XResizeWindow (ximagesink->xcontext->disp,
ximagesink->xwindow->win,
GST_VIDEOSINK_WIDTH (ximagesink),
GST_VIDEOSINK_HEIGHT (ximagesink));*/
GST_VIDEOSINK_HEIGHT (ximagesink));
if ( (ximagesink->ximage) &&
( (GST_VIDEOSINK_WIDTH (ximagesink) != ximagesink->ximage->width) ||