virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

don't complain about codec type/id mismatche for attachment streams

Browse Source 
Originally committed as revision 26316 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2011-01-12 00:33:22 +00:00
parent e3331706fc
commit e83c716e16
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/utils.c
View File

@ -524,7 +524,8 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
avctx->codec_type = codec->type; avctx->codec_type = codec->type;
avctx->codec_id = codec->id; avctx->codec_id = codec->id;
} }
if(avctx->codec_id != codec->id || avctx->codec_type != codec->type){ if (avctx->codec_id != codec->id || (avctx->codec_type != codec->type
&& avctx->codec_type != AVMEDIA_TYPE_ATTACHMENT)) {
av_log(avctx, AV_LOG_ERROR, "codec type or id mismatches\n"); av_log(avctx, AV_LOG_ERROR, "codec type or id mismatches\n");
goto free_and_end; goto free_and_end;
} }