diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 21:45:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-28 01:37:50 +0200 |
| commit | e7f008a53406e17c91d4fd12ffd140baac2560ff (patch) | |
| tree | 9814fd10d22b4831c45e79983ebd544d06702471 /libavcodec | |
| parent | 4f587d163740d61b2571d8a0ed7ca1348078c989 (diff) | |
| download | ffmpeg-e7f008a53406e17c91d4fd12ffd140baac2560ff.tar.gz | |
lavc: Map deprecated codec ids to ours so as to maintain compatibility with the fork.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 719ef5f3cf..80e4e74b8f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -954,10 +954,21 @@ av_cold int avcodec_close(AVCodecContext *avctx) return 0; } +static enum CodecID remap_deprecated_codec_id(enum CodecID id) +{ + switch(id){ + case CODEC_ID_G723_1_DEPRECATED : return CODEC_ID_G723_1; + case CODEC_ID_G729_DEPRECATED : return CODEC_ID_G729; + case CODEC_ID_UTVIDEO_DEPRECATED: return CODEC_ID_UTVIDEO; + default : return id; + } +} + AVCodec *avcodec_find_encoder(enum CodecID id) { AVCodec *p, *experimental=NULL; p = first_avcodec; + id= remap_deprecated_codec_id(id); while (p) { if (p->encode != NULL && p->id == id) { if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) { @@ -988,6 +999,7 @@ AVCodec *avcodec_find_decoder(enum CodecID id) { AVCodec *p, *experimental=NULL; p = first_avcodec; + id= remap_deprecated_codec_id(id); while (p) { if (p->decode != NULL && p->id == id) { if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) { |