From e83c716e16c52fa56a78274408f7628e5dc719da Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Wed, 12 Jan 2011 00:33:22 +0000
Subject: don't complain about codec type/id mismatche for attachment streams

Originally committed as revision 26316 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8cc92994dc..86595a29e9 100644
--- 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;
     }
-- 
cgit v1.2.3