Commit e83c716e authored by Aurelien Jacobs's avatar Aurelien Jacobs

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

Originally committed as revision 26316 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e3331706
......@@ -524,7 +524,8 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
avctx->codec_type = codec->type;
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");
goto free_and_end;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment