Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
374e469b
Commit
374e469b
authored
Jan 12, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
parent
bf868727
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
38 deletions
+0
-38
avio.c
libavformat/avio.c
+0
-23
avio.h
libavformat/avio.h
+0
-12
version.h
libavformat/version.h
+0
-3
No files found.
libavformat/avio.c
View file @
374e469b
...
@@ -84,11 +84,6 @@ const AVClass ffurl_context_class = {
...
@@ -84,11 +84,6 @@ const AVClass ffurl_context_class = {
/*@}*/
/*@}*/
#if FF_API_OLD_INTERRUPT_CB
static
int
default_interrupt_cb
(
void
);
int
(
*
url_interrupt_cb
)(
void
)
=
default_interrupt_cb
;
#endif
const
char
*
avio_enum_protocols
(
void
**
opaque
,
int
output
)
const
char
*
avio_enum_protocols
(
void
**
opaque
,
int
output
)
{
{
URLProtocol
**
p
=
opaque
;
URLProtocol
**
p
=
opaque
;
...
@@ -350,29 +345,11 @@ int ffurl_get_file_handle(URLContext *h)
...
@@ -350,29 +345,11 @@ int ffurl_get_file_handle(URLContext *h)
return
h
->
prot
->
url_get_file_handle
(
h
);
return
h
->
prot
->
url_get_file_handle
(
h
);
}
}
#if FF_API_OLD_INTERRUPT_CB
static
int
default_interrupt_cb
(
void
)
{
return
0
;
}
void
avio_set_interrupt_cb
(
int
(
*
interrupt_cb
)(
void
))
{
if
(
!
interrupt_cb
)
interrupt_cb
=
default_interrupt_cb
;
url_interrupt_cb
=
interrupt_cb
;
}
#endif
int
ff_check_interrupt
(
AVIOInterruptCB
*
cb
)
int
ff_check_interrupt
(
AVIOInterruptCB
*
cb
)
{
{
int
ret
;
int
ret
;
if
(
cb
&&
cb
->
callback
&&
(
ret
=
cb
->
callback
(
cb
->
opaque
)))
if
(
cb
&&
cb
->
callback
&&
(
ret
=
cb
->
callback
(
cb
->
opaque
)))
return
ret
;
return
ret
;
#if FF_API_OLD_INTERRUPT_CB
return
url_interrupt_cb
();
#else
return
0
;
return
0
;
#endif
}
}
libavformat/avio.h
View file @
374e469b
...
@@ -133,18 +133,6 @@ typedef struct {
...
@@ -133,18 +133,6 @@ typedef struct {
*/
*/
int
avio_check
(
const
char
*
url
,
int
flags
);
int
avio_check
(
const
char
*
url
,
int
flags
);
#if FF_API_OLD_INTERRUPT_CB
/**
* The callback is called in blocking functions to test regulary if
* asynchronous interruption is needed. AVERROR_EXIT is returned
* in this case by the interrupted function. 'NULL' means no interrupt
* callback is given.
* @deprecated Use interrupt_callback in AVFormatContext/avio_open2
* instead.
*/
attribute_deprecated
void
avio_set_interrupt_cb
(
int
(
*
interrupt_cb
)(
void
));
#endif
/**
/**
* Allocate and initialize an AVIOContext for buffered I/O. It must be later
* Allocate and initialize an AVIOContext for buffered I/O. It must be later
* freed with av_free().
* freed with av_free().
...
...
libavformat/version.h
View file @
374e469b
...
@@ -47,9 +47,6 @@
...
@@ -47,9 +47,6 @@
* Those FF_API_* defines are not part of public API.
* Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time.
* They may change, break or disappear at any time.
*/
*/
#ifndef FF_API_OLD_INTERRUPT_CB
#define FF_API_OLD_INTERRUPT_CB (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_SET_PTS_INFO
#ifndef FF_API_SET_PTS_INFO
#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 54)
#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif
...
...
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