[FFmpeg-cvslog] r26316 - trunk/libavcodec/utils.c

[aurel]

Author: aurel
Date: Wed Jan 12 01:33:22 2011
New Revision: 26316

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

Modified:
   trunk/libavcodec/utils.c

Modified: trunk/libavcodec/utils.c
==============================================================================
--- trunk/libavcodec/utils.c	Wed Jan 12 00:53:24 2011	(r26315)
+++ trunk/libavcodec/utils.c	Wed Jan 12 01:33:22 2011	(r26316)
@@ -524,7 +524,8 @@ int attribute_align_arg avcodec_open(AVC
         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;
     }