virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc: Map deprecated codec ids to ours so as to maintain compatibility with the fork.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-10-24 21:45:33 +02:00
parent 4f587d1637
commit e7f008a534
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/utils.c
View File

@@ -954,10 +954,21 @@ av_cold int avcodec_close(AVCodecContext *avctx)
return 0; 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 *avcodec_find_encoder(enum CodecID id)
{ {
AVCodec *p, *experimental=NULL; AVCodec *p, *experimental=NULL;
p = first_avcodec; p = first_avcodec;
id= remap_deprecated_codec_id(id);
while (p) { while (p) {
if (p->encode != NULL && p->id == id) { if (p->encode != NULL && p->id == id) {
if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) { if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) {
@@ -988,6 +999,7 @@ AVCodec *avcodec_find_decoder(enum CodecID id)
{ {
AVCodec *p, *experimental=NULL; AVCodec *p, *experimental=NULL;
p = first_avcodec; p = first_avcodec;
id= remap_deprecated_codec_id(id);
while (p) { while (p) {
if (p->decode != NULL && p->id == id) { if (p->decode != NULL && p->id == id) {
if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) { if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) {