Commit c0f22811 authored by Jan Gerber's avatar Jan Gerber
Browse files

fix line endings

parent 51551a81
......@@ -769,13 +769,13 @@ void ff2theora_output(ff2theora this) {
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 @@ void print_usage() {
" -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 @@ int main(int argc, char **argv) {
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:
......
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