Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
788a60d9
Commit
788a60d9
authored
Apr 17, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: make max frames work again, after merge
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
56b9d9b5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
ffmpeg.c
ffmpeg.c
+1
-1
adpcm-ea-tqi
tests/ref/fate/adpcm-ea-tqi
+0
-1
No files found.
ffmpeg.c
View file @
788a60d9
...
...
@@ -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
;
...
...
tests/ref/fate/adpcm-ea-tqi
View file @
788a60d9
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment