diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2011-01-12 00:33:22 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2011-01-12 00:33:22 +0000 |
| commit | e83c716e16c52fa56a78274408f7628e5dc719da (patch) | |
| tree | e39ab51995997011948647dada5b09f0e172a21a /libavcodec/utils.c | |
| parent | e3331706fcc9888ee85f0b9f763e4d006b178c14 (diff) | |
| download | ffmpeg-e83c716e16c52fa56a78274408f7628e5dc719da.tar.gz | |
don't complain about codec type/id mismatche for attachment streams
Originally committed as revision 26316 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |