|
@@ -480,6 +480,11 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
avctx->codec = codec; |
|
|
avctx->codec = codec; |
|
|
|
|
|
if ((avctx->codec_type == CODEC_TYPE_UNKNOWN || avctx->codec_type == codec->type) && |
|
|
|
|
|
avctx->codec_id == CODEC_ID_NONE) { |
|
|
|
|
|
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){ |
|
|
av_log(avctx, AV_LOG_ERROR, "codec type or id mismatches\n"); |
|
|
av_log(avctx, AV_LOG_ERROR, "codec type or id mismatches\n"); |
|
|
goto free_and_end; |
|
|
goto free_and_end; |
|
|