breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-08-03 10:08:30 +02:00
parent 038c4f65ee 7950e519bb
commit 20be5e0a0e
20 changed files with 99 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/avfiltergraph.c
View File

@@ -28,6 +28,7 @@
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
#include "libavutil/channel_layout.h"
#include "libavutil/internal.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2()
@@ -136,7 +137,9 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
graph->filters[graph->nb_filters++] = filter;
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
graph->filter_count_unused = graph->nb_filters;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
filter->graph = graph;
@@ -201,7 +204,9 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
graph->filters[graph->nb_filters++] = s;
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
graph->filter_count_unused = graph->nb_filters;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
s->graph = graph;