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

[oggk at svn.xiph.org]

Author: oggk
Date: 2010-04-10 15:13:56 -0700 (Sat, 10 Apr 2010)
New Revision: 17138

Modified:
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
Log:
make a logical or use a logical or rather than a bitwise one; precendence
 is the same in this case, but it's less confusing.



Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2010-04-10 22:13:45 UTC (rev 17137)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2010-04-10 22:13:56 UTC (rev 17138)
@@ -842,7 +842,7 @@
         this->frame_y_offset = this->frame_height-this->picture_height>>1&~1;
 
         //Bicubic  (best for upscaling),
-        if(display_width - (this->frame_leftBand + this->frame_rightBand) < this->picture_width |
+        if(display_width - (this->frame_leftBand + this->frame_rightBand) < this->picture_width ||
            display_height - (this->frame_topBand + this->frame_bottomBand) < this->picture_height) {
            sws_flags = SWS_BICUBIC;
         } else {        //Bilinear (best for downscaling),