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
040e285b
Commit
040e285b
authored
Feb 05, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avio: remove interrupt callback for output
sout_access_out objects are always alive. This was a no-op.
parent
4ab1ae0f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
modules/access/avio.c
modules/access/avio.c
+2
-6
No files found.
modules/access/avio.c
View file @
040e285b
...
...
@@ -70,7 +70,7 @@ static int OutSeek (sout_access_out_t *, off_t);
static
int
UrlInterruptCallback
(
void
*
access
)
{
return
!
vlc_object_alive
((
vlc_object_t
*
)
access
);
return
!
vlc_object_alive
((
access_t
*
)
access
);
}
struct
access_sys_t
...
...
@@ -233,10 +233,6 @@ int OutOpenAvio(vlc_object_t *object)
#if LIBAVFORMAT_VERSION_MAJOR < 54
ret
=
avio_open
(
&
sys
->
context
,
access
->
psz_path
,
AVIO_FLAG_WRITE
);
#else
AVIOInterruptCB
cb
=
{
.
callback
=
UrlInterruptCallback
,
.
opaque
=
access
,
};
AVDictionary
*
options
=
NULL
;
char
*
psz_opts
=
var_InheritString
(
access
,
"sout-avio-options"
);
if
(
psz_opts
&&
*
psz_opts
)
{
...
...
@@ -244,7 +240,7 @@ int OutOpenAvio(vlc_object_t *object)
free
(
psz_opts
);
}
ret
=
avio_open2
(
&
sys
->
context
,
access
->
psz_path
,
AVIO_FLAG_WRITE
,
&
cb
,
&
options
);
NULL
,
&
options
);
AVDictionaryEntry
*
t
=
NULL
;
while
((
t
=
av_dict_get
(
options
,
""
,
t
,
AV_DICT_IGNORE_SUFFIX
)))
msg_Err
(
access
,
"unknown option
\"
%s
\"
"
,
t
->
key
);
...
...
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