diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-08-26 20:19:42 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-08-26 20:19:42 +0000 |
| commit | 9b393cbd711802b4a5239ac4ea1783f8b34cf96b (patch) | |
| tree | 10ac4b27b4161b5cea8dc85a01e570385ef20d40 | |
| parent | af42d19c76578234ac9903b68a5d130a654da455 (diff) | |
closes bug #119105RELEASE-0_6_4RELEASE-0_6_3BRANCH-GSTREAMER-0_6
Original commit message from CVS:
closes bug #119105
| m--------- | common | 0 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegenc.c | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/common b/common -Subproject 50879a63c4fa8f2544d4d89a9dbfa0f5720c326 +Subproject b4a839c99c0bf2d4903824426ef3cc0d4b0ad99 diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c index f2237b4..de69106 100644 --- a/ext/ffmpeg/gstffmpegenc.c +++ b/ext/ffmpeg/gstffmpegenc.c @@ -411,7 +411,7 @@ gst_ffmpegenc_chain_video (GstPad *pad, GstBuffer *inbuf) } */ - avpicture_fill ((AVPicture*)&picture, data, PIX_FMT_YUV420P, ffmpegenc->in_width, ffmpegenc->in_height); + avpicture_fill ((AVPicture*)(void *)&picture, data, PIX_FMT_YUV420P, ffmpegenc->in_width, ffmpegenc->in_height); toencode = &picture; if (ffmpegenc->need_resample) { @@ -419,12 +419,13 @@ gst_ffmpegenc_chain_video (GstPad *pad, GstBuffer *inbuf) guint8 *rdata; rdata = g_malloc ((rframe_size * 3)/2); - avpicture_fill ((AVPicture*)&rpicture, rdata, PIX_FMT_YUV420P, ffmpegenc->context->width, ffmpegenc->context->height); + avpicture_fill ((AVPicture*)(void *)&rpicture, rdata, PIX_FMT_YUV420P, ffmpegenc->context->width, ffmpegenc->context->height); free_res = TRUE; toencode = &rpicture; - img_resample (ffmpegenc->resample, (AVPicture*)&rpicture, (AVPicture*)&picture); + img_resample (ffmpegenc->resample, (AVPicture*)(void *)&rpicture, + (AVPicture*)(void *)&picture); } outbuf = gst_buffer_new (); |