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
f6b3f672
Commit
f6b3f672
authored
Jan 28, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Factor vlc_object_release() into DeleteDecoder()
parent
5d90ca7c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
src/input/decoder.c
src/input/decoder.c
+2
-8
No files found.
src/input/decoder.c
View file @
f6b3f672
...
@@ -286,7 +286,6 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
...
@@ -286,7 +286,6 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
DecoderUnsupportedCodec
(
p_dec
,
fmt
->
i_codec
);
DecoderUnsupportedCodec
(
p_dec
,
fmt
->
i_codec
);
DeleteDecoder
(
p_dec
);
DeleteDecoder
(
p_dec
);
vlc_object_release
(
p_dec
);
return
NULL
;
return
NULL
;
}
}
...
@@ -304,7 +303,6 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
...
@@ -304,7 +303,6 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
msg_Err
(
p_dec
,
"cannot spawn decoder thread"
);
msg_Err
(
p_dec
,
"cannot spawn decoder thread"
);
module_unneed
(
p_dec
,
p_dec
->
p_module
);
module_unneed
(
p_dec
,
p_dec
->
p_module
);
DeleteDecoder
(
p_dec
);
DeleteDecoder
(
p_dec
);
vlc_object_release
(
p_dec
);
return
NULL
;
return
NULL
;
}
}
...
@@ -346,11 +344,8 @@ void input_DecoderDelete( decoder_t *p_dec )
...
@@ -346,11 +344,8 @@ void input_DecoderDelete( decoder_t *p_dec )
input_DecoderSetCcState
(
p_dec
,
false
,
i
);
input_DecoderSetCcState
(
p_dec
,
false
,
i
);
}
}
/* Delete decoder
configuration
*/
/* Delete decoder */
DeleteDecoder
(
p_dec
);
DeleteDecoder
(
p_dec
);
/* Delete the decoder */
vlc_object_release
(
p_dec
);
}
}
/**
/**
...
@@ -440,7 +435,6 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
...
@@ -440,7 +435,6 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
{
{
DecoderUnsupportedCodec
(
p_dec
,
fcc
[
i_channel
]
);
DecoderUnsupportedCodec
(
p_dec
,
fcc
[
i_channel
]
);
DeleteDecoder
(
p_cc
);
DeleteDecoder
(
p_cc
);
vlc_object_release
(
p_cc
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
p_cc
->
p_owner
->
p_clock
=
p_owner
->
p_clock
;
p_cc
->
p_owner
->
p_clock
=
p_owner
->
p_clock
;
...
@@ -463,7 +457,6 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
...
@@ -463,7 +457,6 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
vlc_object_kill
(
p_cc
);
vlc_object_kill
(
p_cc
);
module_unneed
(
p_cc
,
p_cc
->
p_module
);
module_unneed
(
p_cc
,
p_cc
->
p_module
);
DeleteDecoder
(
p_cc
);
DeleteDecoder
(
p_cc
);
vlc_object_release
(
p_cc
);
}
}
}
}
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
@@ -2112,6 +2105,7 @@ static void DeleteDecoder( decoder_t * p_dec )
...
@@ -2112,6 +2105,7 @@ static void DeleteDecoder( decoder_t * p_dec )
vlc_mutex_destroy
(
&
p_owner
->
lock
);
vlc_mutex_destroy
(
&
p_owner
->
lock
);
vlc_object_detach
(
p_dec
);
vlc_object_detach
(
p_dec
);
vlc_object_release
(
p_dec
);
free
(
p_owner
);
free
(
p_owner
);
}
}
...
...
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