Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-17 05:54:49 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-04-17 06:37:08 +0400
commit788a60d9d6ad2b1fb3b6f88baf668e65724a2d9f (patch)
tree00bf969146e8db1c13b386c886bdefcdbf481b0a /ffmpeg.c
parent56b9d9b5cd28b008fea8cbb36cdf780955c9f648 (diff)
ffmpeg: make max frames work again, after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 64132794a9..a92d534704 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3440,7 +3440,7 @@ static int transcode(void)
if (ost->is_past_recording_time ||
(os->pb && avio_tell(os->pb) >= of->limit_filesize))
continue;
- if (ost->frame_number > ost->max_frames) {
+ if (ost->frame_number >= ost->max_frames) {
int j;
for (j = 0; j < of->ctx->nb_streams; j++)
output_streams[of->ost_index + j]->is_past_recording_time = 1;