Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
4c8e56e8
Commit
4c8e56e8
authored
Jan 30, 2004
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* all: sout have now access to psz_language.
parent
7d320e18
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
src/input/es_out.c
src/input/es_out.c
+3
-4
src/input/input_dec.c
src/input/input_dec.c
+5
-1
No files found.
src/input/es_out.c
View file @
4c8e56e8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* es_out.c: Es Out handler for input.
* es_out.c: Es Out handler for input.
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003-2004 VideoLAN
* Copyright (C) 2003-2004 VideoLAN
* $Id: es_out.c,v 1.2
2 2004/01/30 14:25:39
fenrir Exp $
* $Id: es_out.c,v 1.2
3 2004/01/30 17:49:21
fenrir Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
...
@@ -525,17 +525,16 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
...
@@ -525,17 +525,16 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
if
(
p_playlist
)
vlc_object_release
(
p_playlist
);
if
(
p_playlist
)
vlc_object_release
(
p_playlist
);
}
}
es_format_Copy
(
&
es
->
p_es
->
fmt
,
fmt
);
/* Apply mode
/* Apply mode
* XXX change that when we do group too */
* XXX change that when we do group too */
if
(
1
)
if
(
1
)
{
{
EsOutSelect
(
out
,
es
,
VLC_FALSE
);
EsOutSelect
(
out
,
es
,
VLC_FALSE
);
}
}
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
es
->
p_es
->
fmt
=
*
fmt
;
TAB_APPEND
(
out
->
p_sys
->
i_es
,
out
->
p_sys
->
es
,
es
);
TAB_APPEND
(
out
->
p_sys
->
i_es
,
out
->
p_sys
->
es
,
es
);
p_sys
->
i_id
++
;
/* always incremented */
p_sys
->
i_id
++
;
/* always incremented */
switch
(
fmt
->
i_cat
)
switch
(
fmt
->
i_cat
)
...
...
src/input/input_dec.c
View file @
4c8e56e8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* input_dec.c: Functions for the management of decoders
* input_dec.c: Functions for the management of decoders
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2004 VideoLAN
* Copyright (C) 1999-2004 VideoLAN
* $Id: input_dec.c,v 1.8
8 2004/01/25 17:16:05 zorglub
Exp $
* $Id: input_dec.c,v 1.8
9 2004/01/30 17:49:21 fenrir
Exp $
*
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
* Gildas Bazin <gbazin@netcourrier.com>
...
@@ -582,6 +582,10 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
...
@@ -582,6 +582,10 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
p_dec
->
p_owner
->
p_es_descriptor
->
p_pgrm
->
i_number
;
p_dec
->
p_owner
->
p_es_descriptor
->
p_pgrm
->
i_number
;
}
}
p_dec
->
p_owner
->
sout
.
i_id
=
p_dec
->
p_owner
->
p_es_descriptor
->
i_id
-
1
;
p_dec
->
p_owner
->
sout
.
i_id
=
p_dec
->
p_owner
->
p_es_descriptor
->
i_id
-
1
;
if
(
p_dec
->
fmt_in
.
psz_language
)
{
p_dec
->
p_owner
->
sout
.
psz_language
=
strdup
(
p_dec
->
fmt_in
.
psz_language
);
}
p_dec
->
p_owner
->
p_sout
=
p_dec
->
p_owner
->
p_sout
=
sout_InputNew
(
p_dec
,
&
p_dec
->
p_owner
->
sout
);
sout_InputNew
(
p_dec
,
&
p_dec
->
p_owner
->
sout
);
...
...
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