[Redbutton-devel] SF.net SVN: redbutton: [74] redbutton-browser/trunk

[<ski...@us...>]

Revision: 74
Author:   skilvington
Date:     2006-05-22 06:30:46 -0700 (Mon, 22 May 2006)
ViewCVS:  http://svn.sourceforge.net/redbutton/?rev=74&view=rev

Log Message:
-----------
bug fix

Modified Paths:
--------------
    redbutton-browser/trunk/MHEGVideoOutput.c
    redbutton-browser/trunk/MHEGVideoOutput.h
Modified: redbutton-browser/trunk/MHEGVideoOutput.c
===================================================================
--- redbutton-browser/trunk/MHEGVideoOutput.c	2006-05-22 12:58:15 UTC (rev 73)
+++ redbutton-browser/trunk/MHEGVideoOutput.c	2006-05-22 13:30:46 UTC (rev 74)
@@ -82,7 +82,6 @@
 void
 x11_shm_prepareFrame(MHEGVideoOutput *v, VideoFrame *f, unsigned int out_width, unsigned int out_height)
 {
-	AVPicture resized_frame;
 	AVPicture *yuv_frame;
 	int tmpbuf_size;
 
@@ -106,10 +105,10 @@
 			v->resize_ctx = img_resample_init(out_width, out_height, f->width, f->height);
 			tmpbuf_size = avpicture_get_size(f->pix_fmt, out_width, out_height);
 			v->tmpbuf_data = safe_malloc(tmpbuf_size);
-			avpicture_fill(&resized_frame, v->tmpbuf_data, f->pix_fmt, out_width, out_height);
+			avpicture_fill(&v->resized_frame, v->tmpbuf_data, f->pix_fmt, out_width, out_height);
 		}
-		img_resample(v->resize_ctx, &resized_frame, &f->frame);
-		yuv_frame = &resized_frame;
+		img_resample(v->resize_ctx, &v->resized_frame, &f->frame);
+		yuv_frame = &v->resized_frame;
 	}
 	else
 	{

Modified: redbutton-browser/trunk/MHEGVideoOutput.h
===================================================================
--- redbutton-browser/trunk/MHEGVideoOutput.h	2006-05-22 12:58:15 UTC (rev 73)
+++ redbutton-browser/trunk/MHEGVideoOutput.h	2006-05-22 13:30:46 UTC (rev 74)
@@ -11,6 +11,7 @@
 	AVPicture rgb_frame;
 	enum PixelFormat out_format;
 	ImgReSampleContext *resize_ctx;
+	AVPicture resized_frame;
 	uint8_t *tmpbuf_data;
 	pthread_mutex_t current_frame_lock;	/* locked when we are updating current frame */
 	XImage *current_frame;			/* frame we are currently displaying */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.