diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-05-18 13:56:22 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-05-19 10:59:52 +0200 |
| commit | aa1246ea42911bf1d193fbaa3c89b2d5a6a809ab (patch) | |
| tree | 70a7be45804ebb3a39b5c74cc53d8574696f0325 /libavfilter/buffersrc.h | |
| parent | 7997fc49ef5817bd86e24335ceba30ce6ee2332e (diff) | |
| download | ffmpeg-aa1246ea42911bf1d193fbaa3c89b2d5a6a809ab.tar.gz | |
lavfi: unify src_buffer and buffersrc.
Most of the code is moved to buffersrc.c
to help Git see the similarities.
src_buffer.c still contains the obsolete compatibility functions.
The format change detection code was removed as it has been
implemented directly in ffmpeg.
It can easily be brought back from the history.
Diffstat (limited to 'libavfilter/buffersrc.h')
| -rw-r--r-- | libavfilter/buffersrc.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h index 27fc2867a0..cd6492e5cb 100644 --- a/libavfilter/buffersrc.h +++ b/libavfilter/buffersrc.h @@ -27,7 +27,6 @@ #include "avfilter.h" -#if 1 enum { /** @@ -63,7 +62,6 @@ int av_buffersrc_add_ref(AVFilterContext *buffer_src, */ unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src); -#else /** * Add a buffer to the filtergraph s. * @@ -83,6 +81,5 @@ int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf); * hit. Use av_buffersrc_buffer() to avoid copying the data. */ int av_buffersrc_write_frame(AVFilterContext *s, AVFrame *frame); -#endif #endif /* AVFILTER_BUFFERSRC_H */ |