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
7ceceee8
Commit
7ceceee8
authored
Jan 25, 2021
by
Piotr Uracz
Committed by
Paul B Mahol
Feb 01, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/aac_ac3_parser: fix channel information parsing in case decoder is disabled
Fixes #7372
parent
ad2cc0e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
aac_ac3_parser.c
libavcodec/aac_ac3_parser.c
+2
-2
No files found.
libavcodec/aac_ac3_parser.c
View file @
7ceceee8
...
...
@@ -89,7 +89,7 @@ get_next:
the frame). */
if
(
avctx
->
codec_id
!=
AV_CODEC_ID_AAC
)
{
avctx
->
sample_rate
=
s
->
sample_rate
;
if
(
avctx
->
codec_id
!=
AV_CODEC_ID_EAC3
)
{
if
(
!
CONFIG_EAC3_DECODER
||
avctx
->
codec_id
!=
AV_CODEC_ID_EAC3
)
{
avctx
->
channels
=
s
->
channels
;
avctx
->
channel_layout
=
s
->
channel_layout
;
}
...
...
@@ -99,7 +99,7 @@ get_next:
/* Calculate the average bit rate */
s
->
frame_number
++
;
if
(
avctx
->
codec_id
!=
AV_CODEC_ID_EAC3
)
{
if
(
!
CONFIG_EAC3_DECODER
||
avctx
->
codec_id
!=
AV_CODEC_ID_EAC3
)
{
avctx
->
bit_rate
+=
(
s
->
bit_rate
-
avctx
->
bit_rate
)
/
s
->
frame_number
;
}
...
...
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