[FFmpeg-cvslog] ffmpeg: fix wrong indention that leaked in from merge
Michael Niedermayer
git at videolan.org
Wed Sep 28 03:20:56 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 28 02:11:07 2011 +0200| [2f3dd904f4d3b2df5ea36ab5720d8f8834c54817] | committer: Michael Niedermayer
ffmpeg: fix wrong indention that leaked in from merge
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f3dd904f4d3b2df5ea36ab5720d8f8834c54817
---
ffmpeg.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index ce57fd9..0ebf96d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1745,11 +1745,11 @@ static int output_packet(InputStream *ist, int ist_index,
if (of->start_time == 0 || ist->pts >= of->start_time) {
ost = &ost_table[i];
if (ost->input_video_filter && ost->source_index == ist_index) {
- if (!decoded_frame->sample_aspect_ratio.num)
- decoded_frame->sample_aspect_ratio = ist->st->sample_aspect_ratio;
- decoded_frame->pts = ist->pts;
+ if (!decoded_frame->sample_aspect_ratio.num)
+ decoded_frame->sample_aspect_ratio = ist->st->sample_aspect_ratio;
+ decoded_frame->pts = ist->pts;
- av_vsrc_buffer_add_frame(ost->input_video_filter, decoded_frame, AV_VSRC_BUF_FLAG_OVERWRITE);
+ av_vsrc_buffer_add_frame(ost->input_video_filter, decoded_frame, AV_VSRC_BUF_FLAG_OVERWRITE);
}
}
}
More information about the ffmpeg-cvslog
mailing list