Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
363541c9
Commit
363541c9
authored
May 03, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder: initialize callbacks data before probing the module
This fixes aout_update_format and vout_update_format.
parent
4b3cb044
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
22 deletions
+22
-22
src/input/decoder.c
src/input/decoder.c
+22
-22
No files found.
src/input/decoder.c
View file @
363541c9
...
@@ -1511,6 +1511,23 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
...
@@ -1511,6 +1511,23 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
p_owner
->
p_sout_input
=
NULL
;
p_owner
->
p_sout_input
=
NULL
;
p_owner
->
p_packetizer
=
NULL
;
p_owner
->
p_packetizer
=
NULL
;
p_owner
->
b_packetizer
=
b_packetizer
;
p_owner
->
b_packetizer
=
b_packetizer
;
p_owner
->
b_fmt_description
=
false
;
p_owner
->
p_description
=
NULL
;
p_owner
->
b_paused
=
false
;
p_owner
->
pause
.
i_date
=
VLC_TS_INVALID
;
p_owner
->
pause
.
i_ignore
=
0
;
p_owner
->
b_waiting
=
false
;
p_owner
->
b_first
=
true
;
p_owner
->
b_has_data
=
false
;
p_owner
->
b_flushing
=
false
;
p_owner
->
b_draining
=
false
;
p_owner
->
b_drained
=
false
;
p_owner
->
b_idle
=
false
;
es_format_Init
(
&
p_owner
->
fmt
,
UNKNOWN_ES
,
0
);
es_format_Init
(
&
p_owner
->
fmt
,
UNKNOWN_ES
,
0
);
/* decoder fifo */
/* decoder fifo */
...
@@ -1522,6 +1539,11 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
...
@@ -1522,6 +1539,11 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
return
NULL
;
return
NULL
;
}
}
vlc_mutex_init
(
&
p_owner
->
lock
);
vlc_cond_init
(
&
p_owner
->
wait_request
);
vlc_cond_init
(
&
p_owner
->
wait_acknowledge
);
vlc_cond_init
(
&
p_owner
->
wait_fifo
);
/* Set buffers allocation callbacks for the decoders */
/* Set buffers allocation callbacks for the decoders */
p_dec
->
pf_aout_format_update
=
aout_update_format
;
p_dec
->
pf_aout_format_update
=
aout_update_format
;
p_dec
->
pf_vout_format_update
=
vout_update_format
;
p_dec
->
pf_vout_format_update
=
vout_update_format
;
...
@@ -1583,28 +1605,6 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
...
@@ -1583,28 +1605,6 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
}
}
}
}
/* */
vlc_mutex_init
(
&
p_owner
->
lock
);
vlc_cond_init
(
&
p_owner
->
wait_request
);
vlc_cond_init
(
&
p_owner
->
wait_acknowledge
);
vlc_cond_init
(
&
p_owner
->
wait_fifo
);
p_owner
->
b_fmt_description
=
false
;
p_owner
->
p_description
=
NULL
;
p_owner
->
b_paused
=
false
;
p_owner
->
pause
.
i_date
=
VLC_TS_INVALID
;
p_owner
->
pause
.
i_ignore
=
0
;
p_owner
->
b_waiting
=
false
;
p_owner
->
b_first
=
true
;
p_owner
->
b_has_data
=
false
;
p_owner
->
b_flushing
=
false
;
p_owner
->
b_draining
=
false
;
p_owner
->
b_drained
=
false
;
p_owner
->
b_idle
=
false
;
/* */
/* */
p_owner
->
cc
.
b_supported
=
false
;
p_owner
->
cc
.
b_supported
=
false
;
if
(
!
b_packetizer
)
if
(
!
b_packetizer
)
...
...
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