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
b89f8774
Commit
b89f8774
authored
Jan 18, 2012
by
Dustin Brody
Committed by
Anton Khirnov
Jan 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avidec: migrate last of lavf from FF_ER_* to AV_EF_*
Signed-off-by:
Anton Khirnov
<
anton@khirnov.net
>
parent
8e1340ab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
avidec.c
libavformat/avidec.c
+4
-3
No files found.
libavformat/avidec.c
View file @
b89f8774
...
...
@@ -666,9 +666,9 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
case
MKTAG
(
'i'
,
'n'
,
'd'
,
'x'
):
i
=
avio_tell
(
pb
);
if
(
pb
->
seekable
&&
!
(
s
->
flags
&
AVFMT_FLAG_IGNIDX
)
&&
read_braindead_odml_indx
(
s
,
0
)
<
0
&&
s
->
error_recognition
>=
FF_ER_EXPLODE
){
read_braindead_odml_indx
(
s
,
0
)
<
0
&&
(
s
->
error_recognition
&
AV_EF_EXPLODE
))
goto
fail
;
}
avio_seek
(
pb
,
i
+
size
,
SEEK_SET
);
break
;
case
MKTAG
(
'v'
,
'p'
,
'r'
,
'p'
):
...
...
@@ -705,7 +705,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
if
(
size
>
1000000
){
av_log
(
s
,
AV_LOG_ERROR
,
"Something went wrong during header parsing, "
"I will ignore it and try to continue anyway.
\n
"
);
if
(
s
->
error_recognition
>=
FF_ER_EXPLODE
)
goto
fail
;
if
(
s
->
error_recognition
&
AV_EF_EXPLODE
)
goto
fail
;
avi
->
movi_list
=
avio_tell
(
pb
)
-
4
;
avi
->
movi_end
=
avio_size
(
pb
);
goto
end_of_header
;
...
...
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