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

ffmpeg: reindent after video frame polling simplification.

Browse Source
pull/3/merge
Clément Bœsch 13 years ago committed by Clément Bœsch
parent e22c7b4e25
commit aede21f1b6
1 changed files with 16 additions and 16 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. 32
      ffmpeg.c

32
ffmpeg.c
Unescape View File

@ -2127,22 +2127,22 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
while (av_buffersink_poll_frame(ost->output_video_filter)) { while (av_buffersink_poll_frame(ost->output_video_filter)) {
AVRational ist_pts_tb = ost->output_video_filter->inputs[0]->time_base; AVRational ist_pts_tb = ost->output_video_filter->inputs[0]->time_base;
if (av_buffersink_get_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0){ if (av_buffersink_get_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0){
av_log(0, AV_LOG_WARNING, "AV Filter told us it has a frame available but failed to output one\n"); av_log(0, AV_LOG_WARNING, "AV Filter told us it has a frame available but failed to output one\n");
goto cont; goto cont;
} }
if (!ist->filtered_frame && !(ist->filtered_frame = avcodec_alloc_frame())) { if (!ist->filtered_frame && !(ist->filtered_frame = avcodec_alloc_frame())) {
av_free(buffer_to_free); av_free(buffer_to_free);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else } else
avcodec_get_frame_defaults(ist->filtered_frame); avcodec_get_frame_defaults(ist->filtered_frame);
filtered_frame = ist->filtered_frame; filtered_frame = ist->filtered_frame;
*filtered_frame= *decoded_frame; //for me_threshold *filtered_frame= *decoded_frame; //for me_threshold
if (ost->picref) { if (ost->picref) {
avfilter_fill_frame_from_video_buffer_ref(filtered_frame, ost->picref); avfilter_fill_frame_from_video_buffer_ref(filtered_frame, ost->picref);
filtered_frame->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); filtered_frame->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
} }
if (ost->picref->video && !ost->frame_aspect_ratio) if (ost->picref->video && !ost->frame_aspect_ratio)
ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio; ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio;
#else #else

Write Preview
Loading…
Cancel
Save