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
0c9dd939
Commit
0c9dd939
authored
Mar 01, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/ac3dec: Use avpriv_ac3_parse_header2()
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
eadc21cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
ac3dec.c
libavformat/ac3dec.c
+9
-8
No files found.
libavformat/ac3dec.c
View file @
0c9dd939
...
...
@@ -28,7 +28,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id)
{
int
max_frames
,
first_frames
=
0
,
frames
;
const
uint8_t
*
buf
,
*
buf2
,
*
end
;
AC3HeaderInfo
hdr
;
AC3HeaderInfo
*
phdr
=
NULL
;
GetBitContext
gbc
;
enum
AVCodecID
codec_id
=
AV_CODEC_ID_AC3
;
...
...
@@ -55,27 +55,28 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id)
init_get_bits
(
&
gbc
,
buf3
,
54
);
}
else
init_get_bits
(
&
gbc
,
buf2
,
54
);
if
(
avpriv_ac3_parse_header
(
&
gbc
,
&
hdr
)
<
0
)
if
(
avpriv_ac3_parse_header
2
(
&
gbc
,
&
p
hdr
)
<
0
)
break
;
if
(
buf2
+
hdr
.
frame_size
>
end
)
if
(
buf2
+
phdr
->
frame_size
>
end
)
break
;
if
(
buf
[
0
]
==
0x77
&&
buf
[
1
]
==
0x0B
)
{
av_assert0
(
hdr
.
frame_size
<=
sizeof
(
buf3
));
for
(
i
=
8
;
i
<
hdr
.
frame_size
;
i
+=
2
)
{
av_assert0
(
phdr
->
frame_size
<=
sizeof
(
buf3
));
for
(
i
=
8
;
i
<
phdr
->
frame_size
;
i
+=
2
)
{
buf3
[
i
]
=
buf
[
i
+
1
];
buf3
[
i
+
1
]
=
buf
[
i
];
}
}
if
(
av_crc
(
av_crc_get_table
(
AV_CRC_16_ANSI
),
0
,
gbc
.
buffer
+
2
,
hdr
.
frame_size
-
2
))
if
(
av_crc
(
av_crc_get_table
(
AV_CRC_16_ANSI
),
0
,
gbc
.
buffer
+
2
,
phdr
->
frame_size
-
2
))
break
;
if
(
hdr
.
bitstream_id
>
10
)
if
(
phdr
->
bitstream_id
>
10
)
codec_id
=
AV_CODEC_ID_EAC3
;
buf2
+=
hdr
.
frame_size
;
buf2
+=
phdr
->
frame_size
;
}
max_frames
=
FFMAX
(
max_frames
,
frames
);
if
(
buf
==
p
->
buf
)
first_frames
=
frames
;
}
av_freep
(
&
phdr
);
if
(
codec_id
!=
expected_codec_id
)
return
0
;
// keep this in sync with mp3 probe, both need to avoid
// issues with MPEG-files!
...
...
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