diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 11:32:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 11:32:11 +0100 |
| commit | 03b078721c8e42c413da75f553e740d235092dad (patch) | |
| tree | e8efab14cdede3d6a84265c4873ad547ee704bf5 /libavfilter/avfiltergraph.c | |
| parent | da501ea857b13ea13749e372ccca9ae0804ff4d5 (diff) | |
| parent | 97bf7c03b1338a867da52c159a2afecbdedcfa88 (diff) | |
| download | ffmpeg-03b078721c8e42c413da75f553e740d235092dad.tar.gz | |
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 86be2c4a8c..d75af9003c 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -23,8 +23,8 @@ #include <ctype.h> #include <string.h> -#include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/pixdesc.h" #include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2() #include "avfilter.h" @@ -32,11 +32,6 @@ #include "formats.h" #include "internal.h" -#include "libavutil/audioconvert.h" -#include "libavutil/avassert.h" -#include "libavutil/common.h" -#include "libavutil/log.h" - static const AVClass filtergraph_class = { .class_name = "AVFilterGraph", .item_name = av_default_item_name, |