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 /libavutil/Makefile | |
| 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 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 63da9e9a80..61ddc9a3fc 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -14,6 +14,7 @@ HEADERS = adler32.h \ blowfish.h \ bprint.h \ bswap.h \ + channel_layout.h \ common.h \ cpu.h \ crc.h \ @@ -58,11 +59,11 @@ BUILT_HEADERS = avconfig.h OBJS = adler32.o \ aes.o \ audio_fifo.o \ - audioconvert.o \ avstring.o \ base64.o \ blowfish.o \ bprint.o \ + channel_layout.o \ cpu.o \ crc.o \ des.o \ |