diff options
author | David Schleef <ds@schleef.org> | 2004-01-09 01:53:31 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2004-01-09 01:53:31 +0000 |
commit | 756480d6d563c4878b74cee9953f900202e5b466 (patch) | |
tree | f33b1ec55d1be119033acaa2771511f62b5df556 /gst | |
parent | 0a840a323f4e48bf3c580b1bd62b70ace61e7872 (diff) |
ext/ffmpeg/gstffmpegenc.c: Fix pad_link function to handle formats that ffmpeg returns as multiple caps structures.
Original commit message from CVS:
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect):
Fix pad_link function to handle formats that ffmpeg returns
as multiple caps structures.
* gst/videofilter/gstvideofilter.c: (gst_videofilter_chain):
Only complain if source buffer is _smaller_ than expected.
* gst/videoscale/gstvideoscale.c: (gst_videoscale_init),
(gst_videoscale_handle_src_event): Resize navigation events
when passing them upstream.
* gst/videotestsrc/gstvideotestsrc.c:
* gst/videotestsrc/gstvideotestsrc.h:
* gst/videotestsrc/videotestsrc.c:
* gst/videotestsrc/videotestsrc.h:
Rewrite many of the buffer painting functions to handle odd
sizes (for many formats, size%4!=0 or size%8!=0). Most have
been verified to work with my video card.
* testsuite/gst-lint: Add check for elements calling
gst_pad_get_caps() instead of gst_pad_get_allowed_caps().
Diffstat (limited to 'gst')
-rw-r--r-- | gst/videofilter/gstvideofilter.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gst/videofilter/gstvideofilter.c b/gst/videofilter/gstvideofilter.c index 95e3b006..39c40f1b 100644 --- a/gst/videofilter/gstvideofilter.c +++ b/gst/videofilter/gstvideofilter.c @@ -322,7 +322,12 @@ gst_videofilter_chain (GstPad *pad, GstData *_data) size, videofilter->from_buf_size, videofilter->to_buf_size); - g_return_if_fail (size == videofilter->from_buf_size); + g_return_if_fail (size >= videofilter->from_buf_size); + + if (size > videofilter->from_buf_size) { + GST_INFO("buffer size %ld larger than expected (%d)", + size, videofilter->from_buf_size); + } outbuf = gst_buffer_new(); /* FIXME: handle bufferpools */ |