diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 13:36:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 13:54:40 +0200 |
| commit | 2acb5cd90793de7f375bf6ebf4eabe2b59a2ecc3 (patch) | |
| tree | 5d827d355bab646ca6ccdebe930ac927a02c3713 /libavcodec/Makefile | |
| parent | 4fefe91a33956007f17cfd6e0c5ee1cb3a3f36d8 (diff) | |
| parent | d16860a237ae56a21d051df6556c40de9be53faa (diff) | |
| download | ffmpeg-2acb5cd90793de7f375bf6ebf4eabe2b59a2ecc3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopus: Remap channels using libopus' internal remapping.
Opus decoder using libopus
avcodec: document the use of AVCodecContext.delay for audio decoding
vc1dec: add flush function for WMV9 and VC-1 decoders
http: Increase buffer sizes to cope with longer URIs
nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments
h264_refs: Fix debug tprintf argument types
golomb: const correctness for get_ue()/get_se() function arguments
get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9b86f7cef3..34737f27bb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -657,7 +657,7 @@ OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o \ OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpegdec.o OBJS-$(CONFIG_LIBOPENJPEG_ENCODER) += libopenjpegenc.o -OBJS-$(CONFIG_LIBOPUS_DECODER) += libopus_dec.o vorbis_data.o +OBJS-$(CONFIG_LIBOPUS_DECODER) += libopusdec.o vorbis_data.o OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o \ libschroedinger.o OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o \ |