* 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
Showing the changes to libavfilter/avfiltergraph.c (1 of 20 files). Show all
Unified · Split
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include "libavutil/avstring.h" | 28 | #include "libavutil/avstring.h" |
| 29 | #include "libavutil/bprint.h" | 29 | #include "libavutil/bprint.h" |
| 30 | #include "libavutil/channel_layout.h" | 30 | #include "libavutil/channel_layout.h" |
| 31 | #include "libavutil/internal.h" | ||
| 31 | #include "libavutil/opt.h" | 32 | #include "libavutil/opt.h" |
| 32 | #include "libavutil/pixdesc.h" | 33 | #include "libavutil/pixdesc.h" |
| 33 | #include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2() | 34 | #include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2() |
| @@ -136,7 +137,9 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) · 102 unmodified lines | |||
| 136 | graph->filters[graph->nb_filters++] = filter; | 137 | graph->filters[graph->nb_filters++] = filter; |
| 137 | 138 | ||
| 138 | #if FF_API_FOO_COUNT | 139 | #if FF_API_FOO_COUNT |
| 140 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 139 | graph->filter_count_unused = graph->nb_filters; | 141 | graph->filter_count_unused = graph->nb_filters; |
| 142 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 140 | #endif | 143 | #endif |
| 141 | 144 | ||
| 142 | filter->graph = graph; | 145 | filter->graph = graph; |
| @@ -201,7 +204,9 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph, · 58 unmodified lines | |||
| 201 | graph->filters[graph->nb_filters++] = s; | 204 | graph->filters[graph->nb_filters++] = s; |
| 202 | 205 | ||
| 203 | #if FF_API_FOO_COUNT | 206 | #if FF_API_FOO_COUNT |
| 207 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 204 | graph->filter_count_unused = graph->nb_filters; | 208 | graph->filter_count_unused = graph->nb_filters; |
| 209 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 205 | #endif | 210 | #endif |
| 206 | 211 | ||
| 207 | s->graph = graph; | 212 | s->graph = graph; |