[xiph-commits] r9028 - trunk/ffmpeg2theora

[j at motherfish-iii.xiph.org]

Author: j
Date: 2005-03-03 08:48:56 -0800 (Thu, 03 Mar 2005)
New Revision: 9028

Modified:
   trunk/ffmpeg2theora/ffmpeg2theora.c
Log:
- put offset to top by setting offset to 0, that works better with tested players
- remove debug message



Modified: trunk/ffmpeg2theora/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.c	2005-03-03 16:28:17 UTC (rev 9027)
+++ trunk/ffmpeg2theora/ffmpeg2theora.c	2005-03-03 16:48:56 UTC (rev 9028)
@@ -245,13 +245,15 @@
 		this->frame_width = this->picture_width + (this->picture_width % 16);		
 		this->frame_height = this->picture_height + (this->picture_height % 16);
 
-		this->frame_x_offset = this->frame_width-this->picture_width;
-		this->frame_y_offset = this->frame_height-this->picture_height;
+		this->frame_x_offset = 0;
+		this->frame_y_offset = 0;
 		
 		if(this->frame_width > 0 || this->frame_height > 0){
-			int frame_padtop = 0, frame_padbottom = this->frame_y_offset;
-			int frame_padleft = this->frame_x_offset, frame_padright = 0;
-			
+			int frame_padtop = this->frame_width-this->picture_width;
+			int frame_padbottom = this->frame_y_offset;
+			int frame_padleft = this->frame_x_offset;
+			int frame_padright = this->frame_width-this->picture_width;
+
 			this->img_resample_ctx = img_resample_full_init(
 						  //this->picture_width, this->picture_height,
 						  this->frame_width, this->frame_height,
@@ -443,7 +445,6 @@
 							//as we donot increment frame_number in audio section.
 							frame_number++;
 							if(venc->pix_fmt != PIX_FMT_YUV420P) {
-								fprintf(stderr,"colorspace transform\n");
 								img_convert((AVPicture *)output_tmp,PIX_FMT_YUV420P,
 									    (AVPicture *)frame,venc->pix_fmt,
 											 venc->width,venc->height);