diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 04:54:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 05:11:19 +0200 |
| commit | 7ed9ec033f5f8da5c06ec5f53847dbdbbf8e9dbb (patch) | |
| tree | fa7298f52d823bdcb8c81243c85ea18b7b947432 /libavcodec/utils.c | |
| parent | ac7d0c79c3f6b4ca5a9d1b333107684453191811 (diff) | |
| parent | 4e5b7f31f7aa7a40ef6d255db2cd65ebab7b74db (diff) | |
| download | ffmpeg-7ed9ec033f5f8da5c06ec5f53847dbdbbf8e9dbb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dwt: Drop unused functions spatial_compose{53|97}i()
nutdec: Remove unused and broken debug function stub
avcodec: Drop long-deprecated imgconvert.h header
Add Opus support to the Ogg muxer.
Add Opus codec id and codec description.
avformat: Identify anonymous AVIO typedef structs.
Conflicts:
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/imgconvert.h
libavcodec/version.h
libavformat/oggenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 00434c9114..53b8b2bf1f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -38,7 +38,6 @@ #include "avcodec.h" #include "dsputil.h" #include "libavutil/opt.h" -#include "imgconvert.h" #include "thread.h" #include "frame_thread_encoder.h" #include "audioconvert.h" @@ -1848,6 +1847,7 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) //This is for future deprecatec codec ids, its empty since //last major bump but will fill up again over time, please don't remove it // case AV_CODEC_ID_UTVIDEO_DEPRECATED: return AV_CODEC_ID_UTVIDEO; + case AV_CODEC_ID_OPUS_DEPRECATED: return AV_CODEC_ID_OPUS; default : return id; } } |