har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: make max frames work again, after merge

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-04-17 03:54:49 +02:00
parent 56b9d9b5cd
commit 788a60d9d6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -3440,7 +3440,7 @@ static int transcode(void)
if (ost->is_past_recording_time || if (ost->is_past_recording_time ||
(os->pb && avio_tell(os->pb) >= of->limit_filesize)) (os->pb && avio_tell(os->pb) >= of->limit_filesize))
continue; continue;
if (ost->frame_number > ost->max_frames) { if (ost->frame_number >= ost->max_frames) {
int j; int j;
for (j = 0; j < of->ctx->nb_streams; j++) for (j = 0; j < of->ctx->nb_streams; j++)
output_streams[of->ost_index + j]->is_past_recording_time = 1; output_streams[of->ost_index + j]->is_past_recording_time = 1;

1
tests/ref/fate/adpcm-ea-tqi
View File

@ -49,5 +49,4 @@
0, 23, 23, 1, 115200, 0xf89d56c3 0, 23, 23, 1, 115200, 0xf89d56c3
1, 33824, 33824, 1456, 5824, 0xefe4c365 1, 33824, 33824, 1456, 5824, 0xefe4c365
0, 24, 24, 1, 115200, 0x65fd5e60 0, 24, 24, 1, 115200, 0x65fd5e60
1, 35280, 35280, 1484, 5936, 0x2174304d
0, 25, 25, 1, 115200, 0x0c256424 0, 25, 25, 1, 115200, 0x0c256424