Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
251329fa
Commit
251329fa
authored
Jul 16, 2018
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/bink: move code for skipping unknown fields to correct place
parent
3735d55a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
bink.c
libavformat/bink.c
+8
-6
No files found.
libavformat/bink.c
View file @
251329fa
...
...
@@ -92,6 +92,8 @@ static int read_header(AVFormatContext *s)
uint16_t
flags
;
int
keyframe
;
int
ret
;
uint32_t
signature
;
uint8_t
revision
;
vst
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
vst
)
...
...
@@ -160,14 +162,14 @@ static int read_header(AVFormatContext *s)
return
AVERROR
(
EIO
);
}
if
(
bink
->
num_audio_tracks
)
{
uint32_t
signature
=
(
vst
->
codecpar
->
codec_tag
&
0xFFFFFF
);
uint8_t
revision
=
((
vst
->
codecpar
->
codec_tag
>>
24
)
%
0xFF
);
signature
=
(
vst
->
codecpar
->
codec_tag
&
0xFFFFFF
);
revision
=
((
vst
->
codecpar
->
codec_tag
>>
24
)
%
0xFF
);
if
((
signature
==
AV_RL32
(
"BIK"
)
&&
(
revision
==
0x6b
))
||
/* k */
(
signature
==
AV_RL32
(
"KB2"
)
&&
(
revision
==
0x69
||
revision
==
0x6a
||
revision
==
0x6b
)))
/* i,j,k */
avio_skip
(
pb
,
4
);
/* unknown new field */
if
((
signature
==
AV_RL32
(
"BIK"
)
&&
(
revision
==
'k'
))
||
(
signature
==
AV_RL32
(
"KB2"
)
&&
(
revision
==
'i'
||
revision
==
'j'
||
revision
==
'k'
)))
avio_skip
(
pb
,
4
);
/* unknown new field */
if
(
bink
->
num_audio_tracks
)
{
avio_skip
(
pb
,
4
*
bink
->
num_audio_tracks
);
/* max decoded size */
for
(
i
=
0
;
i
<
bink
->
num_audio_tracks
;
i
++
)
{
...
...
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