Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
438
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
41778535
Commit
41778535
authored
8 months ago
by
François Cartegnie
Committed by
Steve Lhomme
8 months ago
Browse files
Options
Downloads
Patches
Plain Diff
codec: avcodec: fix ch_layout requirement
refs
#28667
parent
785888ad
No related branches found
Branches containing commit
No related tags found
1 merge request
!5552
codec: avcodec: fix ch_layout requirement
Pipeline
#483146
passed with warnings with stages
Stage:
Stage:
in 28 minutes and 25 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
modules/codec/avcodec/audio.c
+1
-1
1 addition, 1 deletion
modules/codec/avcodec/audio.c
modules/demux/avformat/demux.c
+1
-1
1 addition, 1 deletion
modules/demux/avformat/demux.c
modules/demux/avformat/mux.c
+1
-1
1 addition, 1 deletion
modules/demux/avformat/mux.c
with
3 additions
and
3 deletions
modules/codec/avcodec/audio.c
+
1
−
1
View file @
41778535
...
...
@@ -138,7 +138,7 @@ static int OpenAudioCodec( decoder_t *p_dec )
}
ctx
->
sample_rate
=
p_dec
->
fmt_in
->
audio
.
i_rate
;
#if LIBAVUTIL_VERSION_CHECK(5
6
,
31
, 100)
#if LIBAVUTIL_VERSION_CHECK(5
7
,
24
, 100)
av_channel_layout_default
(
&
ctx
->
ch_layout
,
p_dec
->
fmt_in
->
audio
.
i_channels
);
#else
ctx
->
channels
=
p_dec
->
fmt_in
->
audio
.
i_channels
;
...
...
This diff is collapsed.
Click to expand it.
modules/demux/avformat/demux.c
+
1
−
1
View file @
41778535
...
...
@@ -470,7 +470,7 @@ int avformat_OpenDemux( vlc_object_t *p_this )
es_format_Init
(
&
es_fmt
,
AUDIO_ES
,
fcc
);
es_fmt
.
i_original_fourcc
=
CodecTagToFourcc
(
cp
->
codec_tag
);
es_fmt
.
i_bitrate
=
cp
->
bit_rate
;
#if LIBAV
UTIL
_VERSION_CHECK(5
6
,
31
, 100)
#if LIBAV
CODEC
_VERSION_CHECK(5
9
,
24
, 100)
es_fmt
.
audio
.
i_channels
=
cp
->
ch_layout
.
nb_channels
;
#else
es_fmt
.
audio
.
i_channels
=
cp
->
channels
;
...
...
This diff is collapsed.
Click to expand it.
modules/demux/avformat/mux.c
+
1
−
1
View file @
41778535
...
...
@@ -271,7 +271,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
{
case
AUDIO_ES
:
codecpar
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
#if LIBAV
UTIL
_VERSION_CHECK(5
6
,
31
, 100)
#if LIBAV
CODEC
_VERSION_CHECK(5
9
,
24
, 100)
av_channel_layout_default
(
&
codecpar
->
ch_layout
,
fmt
->
audio
.
i_channels
);
#else
codecpar
->
channels
=
fmt
->
audio
.
i_channels
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment