Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_enc: reindent after previous commit

Browse Source
pull/390/head
Anton Khirnov 1 year ago
parent d1a2cd1e13
commit 8b6b2518fa
1 changed files with 33 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 66
      fftools/ffmpeg_enc.c

66
fftools/ffmpeg_enc.c
Unescape View File

@ -228,44 +228,44 @@ static int enc_choose_timebase(OutputStream *ost, AVFrame *frame)
return 0; return 0;
} }
fr = ost->frame_rate; fr = ost->frame_rate;
if (!fr.num) if (!fr.num)
fr = fd->frame_rate_filter; fr = fd->frame_rate_filter;
if (!fr.num && !ost->max_frame_rate.num) { if (!fr.num && !ost->max_frame_rate.num) {
fr = (AVRational){25, 1}; fr = (AVRational){25, 1};
av_log(ost, AV_LOG_WARNING, av_log(ost, AV_LOG_WARNING,
"No information " "No information "
"about the input framerate is available. Falling " "about the input framerate is available. Falling "
"back to a default value of 25fps. Use the -r option " "back to a default value of 25fps. Use the -r option "
"if you want a different framerate.\n"); "if you want a different framerate.\n");
} }
if (ost->max_frame_rate.num && if (ost->max_frame_rate.num &&
(av_q2d(fr) > av_q2d(ost->max_frame_rate) || (av_q2d(fr) > av_q2d(ost->max_frame_rate) ||
!fr.den)) !fr.den))
fr = ost->max_frame_rate; fr = ost->max_frame_rate;
if (enc->codec->supported_framerates && !ost->force_fps) { if (enc->codec->supported_framerates && !ost->force_fps) {
int idx = av_find_nearest_q_idx(fr, enc->codec->supported_framerates); int idx = av_find_nearest_q_idx(fr, enc->codec->supported_framerates);
fr = enc->codec->supported_framerates[idx]; fr = enc->codec->supported_framerates[idx];
} }
// reduce frame rate for mpeg4 to be within the spec limits // reduce frame rate for mpeg4 to be within the spec limits
if (enc->codec_id == AV_CODEC_ID_MPEG4) { if (enc->codec_id == AV_CODEC_ID_MPEG4) {
av_reduce(&fr.num, &fr.den, av_reduce(&fr.num, &fr.den,
fr.num, fr.den, 65535); fr.num, fr.den, 65535);
} }
if (av_q2d(fr) > 1e3 && ost->vsync_method != VSYNC_PASSTHROUGH && if (av_q2d(fr) > 1e3 && ost->vsync_method != VSYNC_PASSTHROUGH &&
(ost->vsync_method == VSYNC_CFR || ost->vsync_method == VSYNC_VSCFR || (ost->vsync_method == VSYNC_CFR || ost->vsync_method == VSYNC_VSCFR ||
(ost->vsync_method == VSYNC_AUTO && !(of->format->flags & AVFMT_VARIABLE_FPS)))){ (ost->vsync_method == VSYNC_AUTO && !(of->format->flags & AVFMT_VARIABLE_FPS)))){
av_log(ost, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n" av_log(ost, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n"
"Please consider specifying a lower framerate, a different muxer or " "Please consider specifying a lower framerate, a different muxer or "
"setting vsync/fps_mode to vfr\n"); "setting vsync/fps_mode to vfr\n");
} }
enc->framerate = fr; enc->framerate = fr;
ost->st->avg_frame_rate = fr; ost->st->avg_frame_rate = fr;
if (!(tb.num > 0 && tb.den > 0)) if (!(tb.num > 0 && tb.den > 0))
tb = av_inv_q(fr); tb = av_inv_q(fr);

Write Preview
Loading…
Cancel
Save