ffmpeg: make max frames work again, after merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/ffmpeg.c b/ffmpeg.c
index 64132794a93244446b5bf9bdfcfa81ff9298d456..a92d5347041c1283ba886b3da405014b99c91333 100644 (file)
--- 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;

diff --git a/tests/ref/fate/adpcm-ea-tqi b/tests/ref/fate/adpcm-ea-tqi
index fc6fe149a102a9aed4805b73a09c3797400f2e2a..5c64661f7bce08c0f9b59010f910c2e3e7513e4b 100644 (file)
--- a/tests/ref/fate/adpcm-ea-tqi
+++ b/tests/ref/fate/adpcm-ea-tqi
@@ -49,5 +49,4 @@
 0,         23,         23,        1,   115200, 0xf89d56c3
 1,      33824,      33824,     1456,     5824, 0xefe4c365
 0,         24,         24,        1,   115200, 0x65fd5e60
-1,      35280,      35280,     1484,     5936, 0x2174304d
 0,         25,         25,        1,   115200, 0x0c256424