[xiph-commits] r17209 - trunk/ffmpeg2theora/src

[j at svn.xiph.org]

Author: j
Date: 2010-05-13 14:40:29 -0700 (Thu, 13 May 2010)
New Revision: 17209

Modified:
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
Log:
fix line endings

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2010-05-13 21:38:30 UTC (rev 17208)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2010-05-13 21:40:29 UTC (rev 17209)
@@ -769,13 +769,13 @@
 
             if (this->max_x > 0) {
                 if (width > height &&
-                    this->max_x/av_q2d(this->frame_aspect) <= this->max_y) {
-                    this->picture_width = this->max_x;
+                    this->max_x/av_q2d(this->frame_aspect) <= this->max_y) {
+                    this->picture_width = this->max_x;
                     this->picture_height = this->max_x / av_q2d(this->frame_aspect);
                     this->picture_height = this->picture_height + this->picture_height%2;
                 } else {
-                    this->picture_height = this->max_y;
-                    this->picture_width = this->max_y * av_q2d(this->frame_aspect);
+                    this->picture_height = this->max_y;
+                    this->picture_width = this->max_y * av_q2d(this->frame_aspect);
                     this->picture_width = this->picture_width + this->picture_width%2;
                 }
             }
@@ -1909,7 +1909,7 @@
 
         "  -x, --width            scale to given width (in pixels)\n"
         "  -y, --height           scale to given height (in pixels)\n"
-        "      --max_size         scale output frame to be within box of \n"
+        "      --max_size         scale output frame to be within box of \n"
         "                         given size, height optional (%%d[x%%d], i.e. 640x480)\n"
         "      --aspect           define frame aspect ratio: i.e. 4:3 or 16:9\n"
         "      --pixel-aspect     define pixel aspect ratio: i.e. 1:1 or 4:3,\n"
@@ -2301,9 +2301,9 @@
                             flag = -1;
                             break;
                         case MAXSIZE_FLAG:
-                            if(sscanf(optarg, "%dx%d", &convert->max_x, &convert->max_y) != 2) {
-                                convert->max_y = convert->max_x = atoi(optarg);
-                            }
+                            if(sscanf(optarg, "%dx%d", &convert->max_x, &convert->max_y) != 2) {
+                                convert->max_y = convert->max_x = atoi(optarg);
+                            }
                             flag = -1;
                             break;
                         case INPUTFPS_FLAG: