Commit 8c987a4f authored by oggk's avatar oggk
Browse files

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.

parent feda355c
......@@ -842,7 +842,7 @@ void ff2theora_output(ff2theora this) {
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),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment