[FFmpeg-cvslog] ffmpeg: fix indent.
Clément Bœsch
git at videolan.org
Thu May 3 20:03:17 CEST 2012
ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu May 3 20:01:23 2012 +0200| [fd4b4dda9ccf7eafbcc6d50121fe245fc322b2d1] | committer: Clément Bœsch
ffmpeg: fix indent.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd4b4dda9ccf7eafbcc6d50121fe245fc322b2d1
---
ffmpeg.c | 89 ++++++++++++++++++++++++++++++-------------------------------
1 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index ff02d8d..43a1b0a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2066,58 +2066,57 @@ static int poll_filters(void)
while (1) {
/* Reap all buffers present in the buffer sinks */
- /* TODO reindent */
- for (i = 0; i < nb_output_streams; i++) {
- OutputStream *ost = output_streams[i];
- OutputFile *of = output_files[ost->file_index];
+ for (i = 0; i < nb_output_streams; i++) {
+ OutputStream *ost = output_streams[i];
+ OutputFile *of = output_files[ost->file_index];
- if (!ost->filter || ost->is_past_recording_time)
- continue;
+ if (!ost->filter || ost->is_past_recording_time)
+ continue;
- if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
- return AVERROR(ENOMEM);
- } else
- avcodec_get_frame_defaults(ost->filtered_frame);
- filtered_frame = ost->filtered_frame;
+ if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
+ return AVERROR(ENOMEM);
+ } else
+ avcodec_get_frame_defaults(ost->filtered_frame);
+ filtered_frame = ost->filtered_frame;
- while (1) {
- AVRational ist_pts_tb = ost->filter->filter->inputs[0]->time_base;
- ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref,
- AV_BUFFERSINK_FLAG_NO_REQUEST);
- if (ret < 0) {
- if (ret != AVERROR(EAGAIN)) {
- char buf[256];
- av_strerror(ret, buf, sizeof(buf));
- av_log(NULL, AV_LOG_WARNING,
- "Error in av_buffersink_get_buffer_ref(): %s\n", buf);
+ while (1) {
+ AVRational ist_pts_tb = ost->filter->filter->inputs[0]->time_base;
+ ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref,
+ AV_BUFFERSINK_FLAG_NO_REQUEST);
+ if (ret < 0) {
+ if (ret != AVERROR(EAGAIN)) {
+ char buf[256];
+ av_strerror(ret, buf, sizeof(buf));
+ av_log(NULL, AV_LOG_WARNING,
+ "Error in av_buffersink_get_buffer_ref(): %s\n", buf);
+ }
+ break;
+ }
+ filtered_frame->pts = av_rescale_q(picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
+ //if (ost->source_index >= 0)
+ // *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
+
+ if (of->start_time && filtered_frame->pts < of->start_time)
+ return 0;
+
+ switch (ost->filter->filter->inputs[0]->type) {
+ case AVMEDIA_TYPE_VIDEO:
+ avfilter_fill_frame_from_video_buffer_ref(filtered_frame, picref);
+ if (!ost->frame_aspect_ratio)
+ ost->st->codec->sample_aspect_ratio = picref->video->sample_aspect_ratio;
+
+ do_video_out(of->ctx, ost, filtered_frame,
+ same_quant ? ost->last_quality :
+ ost->st->codec->global_quality);
+ break;
+ default:
+ // TODO support audio/subtitle filters
+ av_assert0(0);
}
- break;
- }
- filtered_frame->pts = av_rescale_q(picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
-// if (ost->source_index >= 0)
-// *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
-
- if (of->start_time && filtered_frame->pts < of->start_time)
- return 0;
-
- switch (ost->filter->filter->inputs[0]->type) {
- case AVMEDIA_TYPE_VIDEO:
- avfilter_fill_frame_from_video_buffer_ref(filtered_frame, picref);
- if (!ost->frame_aspect_ratio)
- ost->st->codec->sample_aspect_ratio = picref->video->sample_aspect_ratio;
- do_video_out(of->ctx, ost, filtered_frame,
- same_quant ? ost->last_quality :
- ost->st->codec->global_quality);
- break;
- default:
- // TODO support audio/subtitle filters
- av_assert0(0);
+ avfilter_unref_buffer(picref);
}
-
- avfilter_unref_buffer(picref);
}
- }
/* Request frames through all the graphs */
ret_all = nb_success = nb_eof = 0;
for (i = 0; i < nb_filtergraphs; i++) {
More information about the ffmpeg-cvslog
mailing list