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/internal.h | |
| parent | 038c4f65ee6c72f9d1ee4d4e46c74073992fabc8 (diff) | |
| parent | 7950e519bb094897f957b9a9531cc60ba46cbc91 (diff) | |
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/internal.h')
| -rw-r--r-- | libavfilter/internal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 8256b892f4..90b4bf4c21 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -24,6 +24,7 @@ * internal API functions */ +#include "libavutil/internal.h" #include "avfilter.h" #include "avfiltergraph.h" #include "formats.h" @@ -272,7 +273,9 @@ static inline void ff_insert_inpad(AVFilterContext *f, unsigned index, ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad), &f->input_pads, &f->inputs, p); #if FF_API_FOO_COUNT +FF_DISABLE_DEPRECATION_WARNINGS f->input_count = f->nb_inputs; +FF_ENABLE_DEPRECATION_WARNINGS #endif } @@ -283,7 +286,9 @@ static inline void ff_insert_outpad(AVFilterContext *f, unsigned index, ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad), &f->output_pads, &f->outputs, p); #if FF_API_FOO_COUNT +FF_DISABLE_DEPRECATION_WARNINGS f->output_count = f->nb_outputs; +FF_ENABLE_DEPRECATION_WARNINGS #endif } |