diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 03:54:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 04:37:08 +0200 |
| commit | 788a60d9d6ad2b1fb3b6f88baf668e65724a2d9f (patch) | |
| tree | 00bf969146e8db1c13b386c886bdefcdbf481b0a | |
| parent | 56b9d9b5cd28b008fea8cbb36cdf780955c9f648 (diff) | |
| download | ffmpeg-788a60d9d6ad2b1fb3b6f88baf668e65724a2d9f.tar.gz | |
ffmpeg: make max frames work again, after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg.c | 2 | ||||
| -rw-r--r-- | tests/ref/fate/adpcm-ea-tqi | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -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 fc6fe149a1..5c64661f7b 100644 --- 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 |