diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
| commit | 20be5e0a0e7563671efe0f085c9f160ff09ba494 (patch) | |
| tree | 4db1a4e402d97dae295a0c6607726f0f192c0556 /libavfilter/buffersink.c | |
| parent | 038c4f65ee6c72f9d1ee4d4e46c74073992fabc8 (diff) | |
| parent | 7950e519bb094897f957b9a9531cc60ba46cbc91 (diff) | |
| download | ffmpeg-20be5e0a0e7563671efe0f085c9f160ff09ba494.tar.gz | |
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffersink.c')
| -rw-r--r-- | libavfilter/buffersink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 9c81d4d29e..6dca209871 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -27,6 +27,7 @@ #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" +#include "libavutil/internal.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" @@ -263,6 +264,7 @@ void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size) } #if FF_API_AVFILTERBUFFER +FF_DISABLE_DEPRECATION_WARNINGS static void compat_free_buffer(AVFilterBuffer *buf) { AVFrame *frame = buf->priv; @@ -347,6 +349,7 @@ int attribute_align_arg av_buffersink_get_buffer_ref(AVFilterContext *ctx, return compat_read(ctx, bufref, 0, flags); } +FF_ENABLE_DEPRECATION_WARNINGS #endif AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx) |