Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
953fc362
Commit
953fc362
authored
Nov 24, 2009
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
transcode: "audio filter2 doesn't exist anymore
"psz_af2" -> "psz_af"
parent
bcdc891a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/stream_out/transcode.c
modules/stream_out/transcode.c
+6
-6
No files found.
modules/stream_out/transcode.c
View file @
953fc362
...
@@ -328,7 +328,7 @@ struct sout_stream_sys_t
...
@@ -328,7 +328,7 @@ struct sout_stream_sys_t
uint32_t
i_channels
;
uint32_t
i_channels
;
int
i_abitrate
;
int
i_abitrate
;
char
*
psz_af
2
;
char
*
psz_af
;
/* Video */
/* Video */
vlc_fourcc_t
i_vcodec
;
/* codec video (0 if not transcode) */
vlc_fourcc_t
i_vcodec
;
/* codec video (0 if not transcode) */
...
@@ -446,11 +446,11 @@ static int Open( vlc_object_t *p_this )
...
@@ -446,11 +446,11 @@ static int Open( vlc_object_t *p_this )
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"afilter"
,
&
val
);
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"afilter"
,
&
val
);
if
(
val
.
psz_string
&&
*
val
.
psz_string
)
if
(
val
.
psz_string
&&
*
val
.
psz_string
)
p_sys
->
psz_af
2
=
val
.
psz_string
;
p_sys
->
psz_af
=
val
.
psz_string
;
else
else
{
{
free
(
val
.
psz_string
);
free
(
val
.
psz_string
);
p_sys
->
psz_af
2
=
NULL
;
p_sys
->
psz_af
=
NULL
;
}
}
/* Video transcoding parameters */
/* Video transcoding parameters */
...
@@ -641,7 +641,7 @@ static void Close( vlc_object_t * p_this )
...
@@ -641,7 +641,7 @@ static void Close( vlc_object_t * p_this )
sout_StreamDelete
(
p_sys
->
p_out
);
sout_StreamDelete
(
p_sys
->
p_out
);
free
(
p_sys
->
psz_af
2
);
free
(
p_sys
->
psz_af
);
config_ChainDestroy
(
p_sys
->
p_audio_cfg
);
config_ChainDestroy
(
p_sys
->
p_audio_cfg
);
free
(
p_sys
->
psz_aenc
);
free
(
p_sys
->
psz_aenc
);
...
@@ -1226,7 +1226,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
...
@@ -1226,7 +1226,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
aout_BitsPerSample
(
id
->
p_encoder
->
fmt_in
.
i_codec
);
aout_BitsPerSample
(
id
->
p_encoder
->
fmt_in
.
i_codec
);
/* Load user specified audio filters */
/* Load user specified audio filters */
if
(
p_sys
->
psz_af
2
)
if
(
p_sys
->
psz_af
)
{
{
es_format_t
fmt_fl32
=
fmt_last
;
es_format_t
fmt_fl32
=
fmt_last
;
fmt_fl32
.
i_codec
=
fmt_fl32
.
i_codec
=
...
@@ -1242,7 +1242,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
...
@@ -1242,7 +1242,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
id
->
p_uf_chain
=
filter_chain_New
(
p_stream
,
"audio filter"
,
false
,
id
->
p_uf_chain
=
filter_chain_New
(
p_stream
,
"audio filter"
,
false
,
transcode_audio_filter_allocation_init
,
NULL
,
NULL
);
transcode_audio_filter_allocation_init
,
NULL
,
NULL
);
filter_chain_Reset
(
id
->
p_uf_chain
,
&
fmt_last
,
&
fmt_fl32
);
filter_chain_Reset
(
id
->
p_uf_chain
,
&
fmt_last
,
&
fmt_fl32
);
if
(
filter_chain_AppendFromString
(
id
->
p_uf_chain
,
p_sys
->
psz_af
2
)
>
0
)
if
(
filter_chain_AppendFromString
(
id
->
p_uf_chain
,
p_sys
->
psz_af
)
>
0
)
fmt_last
=
*
filter_chain_GetFmtOut
(
id
->
p_uf_chain
);
fmt_last
=
*
filter_chain_GetFmtOut
(
id
->
p_uf_chain
);
}
}
...
...
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