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
8dd0e87d
Commit
8dd0e87d
authored
Jun 25, 2012
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi: remove old video sink API
It was deprecated since a long time and removed after the 2->3 major bump.
parent
f054dbee
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
38 deletions
+2
-38
ffplay.c
ffplay.c
+0
-6
lavfi.c
libavdevice/lavfi.c
+0
-6
buffersink.h
libavfilter/buffersink.h
+0
-9
sink_buffer.c
libavfilter/sink_buffer.c
+2
-14
version.h
libavfilter/version.h
+0
-3
No files found.
ffplay.c
View file @
8dd0e87d
...
@@ -1572,16 +1572,10 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
...
@@ -1572,16 +1572,10 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
graph
))
<
0
)
graph
))
<
0
)
return
ret
;
return
ret
;
#if FF_API_OLD_VSINK_API
ret
=
avfilter_graph_create_filter
(
&
filt_out
,
avfilter_get_by_name
(
"buffersink"
),
"ffplay_buffersink"
,
NULL
,
(
void
*
)
pix_fmts
,
graph
);
#else
buffersink_params
->
pixel_fmts
=
pix_fmts
;
buffersink_params
->
pixel_fmts
=
pix_fmts
;
ret
=
avfilter_graph_create_filter
(
&
filt_out
,
ret
=
avfilter_graph_create_filter
(
&
filt_out
,
avfilter_get_by_name
(
"buffersink"
),
avfilter_get_by_name
(
"buffersink"
),
"ffplay_buffersink"
,
NULL
,
buffersink_params
,
graph
);
"ffplay_buffersink"
,
NULL
,
buffersink_params
,
graph
);
#endif
av_freep
(
&
buffersink_params
);
av_freep
(
&
buffersink_params
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
...
libavdevice/lavfi.c
View file @
8dd0e87d
...
@@ -191,16 +191,10 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
...
@@ -191,16 +191,10 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
if
(
type
==
AVMEDIA_TYPE_VIDEO
)
{
if
(
type
==
AVMEDIA_TYPE_VIDEO
)
{
AVBufferSinkParams
*
buffersink_params
=
av_buffersink_params_alloc
();
AVBufferSinkParams
*
buffersink_params
=
av_buffersink_params_alloc
();
#if FF_API_OLD_VSINK_API
ret
=
avfilter_graph_create_filter
(
&
sink
,
buffersink
,
inout
->
name
,
NULL
,
pix_fmts
,
lavfi
->
graph
);
#else
buffersink_params
->
pixel_fmts
=
pix_fmts
;
buffersink_params
->
pixel_fmts
=
pix_fmts
;
ret
=
avfilter_graph_create_filter
(
&
sink
,
buffersink
,
ret
=
avfilter_graph_create_filter
(
&
sink
,
buffersink
,
inout
->
name
,
NULL
,
inout
->
name
,
NULL
,
buffersink_params
,
lavfi
->
graph
);
buffersink_params
,
lavfi
->
graph
);
#endif
av_freep
(
&
buffersink_params
);
av_freep
(
&
buffersink_params
);
if
(
ret
<
0
)
if
(
ret
<
0
)
...
...
libavfilter/buffersink.h
View file @
8dd0e87d
...
@@ -91,15 +91,6 @@ int av_buffersink_get_buffer_ref(AVFilterContext *buffer_sink,
...
@@ -91,15 +91,6 @@ int av_buffersink_get_buffer_ref(AVFilterContext *buffer_sink,
*/
*/
int
av_buffersink_poll_frame
(
AVFilterContext
*
ctx
);
int
av_buffersink_poll_frame
(
AVFilterContext
*
ctx
);
#if FF_API_OLD_VSINK_API
/**
* @deprecated Use av_buffersink_get_buffer_ref() instead.
*/
attribute_deprecated
int
av_vsink_buffer_get_video_buffer_ref
(
AVFilterContext
*
buffer_sink
,
AVFilterBufferRef
**
picref
,
int
flags
);
#endif
/**
/**
* Get a buffer with filtered data from sink and put it in buf.
* Get a buffer with filtered data from sink and put it in buf.
*
*
...
...
libavfilter/sink_buffer.c
View file @
8dd0e87d
...
@@ -161,32 +161,20 @@ int av_buffersink_poll_frame(AVFilterContext *ctx)
...
@@ -161,32 +161,20 @@ int av_buffersink_poll_frame(AVFilterContext *ctx)
return
av_fifo_size
(
buf
->
fifo
)
/
sizeof
(
AVFilterBufferRef
*
)
+
ff_poll_frame
(
inlink
);
return
av_fifo_size
(
buf
->
fifo
)
/
sizeof
(
AVFilterBufferRef
*
)
+
ff_poll_frame
(
inlink
);
}
}
#if FF_API_OLD_VSINK_API
int
av_vsink_buffer_get_video_buffer_ref
(
AVFilterContext
*
ctx
,
AVFilterBufferRef
**
picref
,
int
flags
)
{
return
av_buffersink_get_buffer_ref
(
ctx
,
picref
,
flags
);
}
#endif
#if CONFIG_BUFFERSINK_FILTER
#if CONFIG_BUFFERSINK_FILTER
static
av_cold
int
vsink_init
(
AVFilterContext
*
ctx
,
const
char
*
args
,
void
*
opaque
)
static
av_cold
int
vsink_init
(
AVFilterContext
*
ctx
,
const
char
*
args
,
void
*
opaque
)
{
{
BufferSinkContext
*
buf
=
ctx
->
priv
;
BufferSinkContext
*
buf
=
ctx
->
priv
;
av_unused
AVBufferSinkParams
*
params
;
AVBufferSinkParams
*
params
=
(
AVBufferSinkParams
*
)
opaque
;
if
(
!
opaque
)
{
if
(
!
opaque
)
{
av_log
(
ctx
,
AV_LOG_WARNING
,
av_log
(
ctx
,
AV_LOG_WARNING
,
"No opaque field provided
\n
"
);
"No opaque field provided
\n
"
);
buf
->
pixel_fmts
=
NULL
;
buf
->
pixel_fmts
=
NULL
;
}
else
{
}
else
{
#if FF_API_OLD_VSINK_API
const
int
*
pixel_fmts
=
(
const
enum
PixelFormat
*
)
opaque
;
#else
params
=
(
AVBufferSinkParams
*
)
opaque
;
const
int
*
pixel_fmts
=
params
->
pixel_fmts
;
const
int
*
pixel_fmts
=
params
->
pixel_fmts
;
#endif
buf
->
pixel_fmts
=
ff_copy_int_list
(
pixel_fmts
);
buf
->
pixel_fmts
=
ff_copy_int_list
(
pixel_fmts
);
if
(
!
buf
->
pixel_fmts
)
if
(
!
buf
->
pixel_fmts
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
...
...
libavfilter/version.h
View file @
8dd0e87d
...
@@ -44,9 +44,6 @@
...
@@ -44,9 +44,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_VSINK_API
#define FF_API_OLD_VSINK_API (LIBAVFILTER_VERSION_MAJOR < 3)
#endif
#ifndef FF_API_OLD_ALL_FORMATS_API
#ifndef FF_API_OLD_ALL_FORMATS_API
#define FF_API_OLD_ALL_FORMATS_API (LIBAVFILTER_VERSION_MAJOR < 3)
#define FF_API_OLD_ALL_FORMATS_API (LIBAVFILTER_VERSION_MAJOR < 3)
#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