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

Originally committed as revision 26316 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago · e83c716e16
parent e3331706fc
commit e83c716e16
1 changed files with 2 additions and 1 deletions
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@ -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;
    }