← Back to branch summary

~siretart/xine-lib/ubuntu

« back to all changes in this revision

Viewing changes to src/video_out/video_out_stk.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2005-12-15 13:13:45 UTC
  • mfrom: (0.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051215131345-8n4osv1j7fy9c1s1
* SECURITY UPDATE: Fix arbitrary code execution with crafted PNG images in
  embedded ffmpeg copy.
* src/libffmpeg/libavcodec/utils.c, avcodec_default_get_buffer(): Apply
  upstream patch to fix buffer overflow on decoding of small PIX_FMT_PAL8
  PNG files.
* References:
  CVE-2005-4048
  http://mplayerhq.hu/pipermail/ffmpeg-devel/2005-November/005333.html
  http://www1.mplayerhq.hu/cgi-bin/cvsweb.cgi/ffmpeg/libavcodec/
  utils.c.diff?r1=1.161&r2=1.162&cvsroot=FFMpeg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/video_out/video_out_stk.c
17
17
 * along with this program; if not, write to the Free Software
18
18
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
19
19
 *
20
 
 * $Id: video_out_stk.c,v 1.14 2004/11/24 16:11:06 mroi Exp $
 
20
 * $Id: video_out_stk.c,v 1.16 2005/09/25 00:44:04 miguelfreitas Exp $
21
21
 *
22
22
 * video_out_stk.c, Libstk Surface Video Driver
23
23
 * more info on Libstk at http://www.libstk.org
63
63
#include "xine.h"
64
64
#include "xine_internal.h"
65
65
#include "video_out.h"
66
 
#include "alphablend.h"
67
66
#include "xineutils.h"
68
67
#include "vo_scale.h"
69
68
 
227
226
    stk_driver_t* this = (stk_driver_t*)this_gen;
228
227
    stk_frame_t* frame = (stk_frame_t*)frame_gen;
229
228
    //printf("video_out_stk: overlay_blend()\n");
 
229
  
 
230
    this->alphablend_extra_data.offset_x = frame_gen->overlay_offset_x;
 
231
    this->alphablend_extra_data.offset_y = frame_gen->overlay_offset_y;
230
232
 
231
233
    if (overlay->rle) {
232
234
        if (frame->format == XINE_IMGFMT_YV12)
233
 
            blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
 
235
            _x_blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
234
236
        else
235
 
            blend_yuy2( frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
 
237
            _x_blend_yuy2( frame->vo_frame.base[0], overlay, frame->width, frame->height, frame->vo_frame.pitches[0], &this->alphablend_extra_data);
236
238
    }
237
239
 
238
240
}
484
486
 
485
487
plugin_info_t xine_plugin_info[] = {
486
488
    /* type, API, "name", version, special_info, init_function */
487
 
    { PLUGIN_VIDEO_OUT, 20, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class },
 
489
    { PLUGIN_VIDEO_OUT, 21, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class },
488
490
    { PLUGIN_NONE, 0, "" , 0 , NULL, NULL}
489
491
};
490
492