diff options
| author | Michael Niedermayer | 2012-11-12 11:32:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2012-11-12 11:32:11 +0100 |
| commit | 03b078721c8e42c413da75f553e740d235092dad (patch) | |
| tree | e8efab14cdede3d6a84265c4873ad547ee704bf5 /doc | |
| parent | da501ea857b13ea13749e372ccca9ae0804ff4d5 (diff) | |
| parent | 97bf7c03b1338a867da52c159a2afecbdedcfa88 (diff) | |
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 'doc')
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | doc/examples/decoding_encoding.c | 2 | ||||
| -rw-r--r-- | doc/filters.texi | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 8ab0d5639f..307e303499 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -110,6 +110,9 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2012-xx-xx - xxxxxxx - lavu 52.2.0 - audioconvert.h + Rename audioconvert.h to channel_layout.h. audioconvert.h is now deprecated. + 2012-xx-xx - xxxxxxx - lavu 52.1.0 - intmath.h Add av_ctz() for trailing zero bit count diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c index cc5953f4af..ae1057c010 100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@ -34,7 +34,7 @@ #include <libavutil/opt.h> #include <libavcodec/avcodec.h> -#include <libavutil/audioconvert.h> +#include <libavutil/channel_layout.h> #include <libavutil/common.h> #include <libavutil/imgutils.h> #include <libavutil/mathematics.h> diff --git a/doc/filters.texi b/doc/filters.texi index 286da97d76..e50e55b410 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1093,7 +1093,7 @@ representing a channel layout. The default value of @var{channel_layout} is "stereo". Check the channel_layout_map definition in -@file{libavcodec/audioconvert.c} for the mapping between strings and +@file{libavutil/channel_layout.c} for the mapping between strings and channel layout values. @item nb_samples, n |