comparison lcldec.c @ 10397:d7ed9dcc78e3 libavcodec

Remove unnecessary calls to avcodec_check_dimensions, the check is already done at a higher level.
author reimar
date Tue, 13 Oct 2009 20:13:28 +0000
parents 21f3bbb20e42
children 8a4984c5cacc
comparison
equal deleted inserted replaced
10396:2bb3882075b6 10397:d7ed9dcc78e3
456 if (avctx->extradata_size < 8) { 456 if (avctx->extradata_size < 8) {
457 av_log(avctx, AV_LOG_ERROR, "Extradata size too small.\n"); 457 av_log(avctx, AV_LOG_ERROR, "Extradata size too small.\n");
458 return 1; 458 return 1;
459 } 459 }
460 460
461 if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
462 return 1;
463 }
464
465 /* Check codec type */ 461 /* Check codec type */
466 if ((avctx->codec_id == CODEC_ID_MSZH && avctx->extradata[7] != CODEC_MSZH) || 462 if ((avctx->codec_id == CODEC_ID_MSZH && avctx->extradata[7] != CODEC_MSZH) ||
467 (avctx->codec_id == CODEC_ID_ZLIB && avctx->extradata[7] != CODEC_ZLIB)) { 463 (avctx->codec_id == CODEC_ID_ZLIB && avctx->extradata[7] != CODEC_ZLIB)) {
468 av_log(avctx, AV_LOG_ERROR, "Codec id and codec type mismatch. This should not happen.\n"); 464 av_log(avctx, AV_LOG_ERROR, "Codec id and codec type mismatch. This should not happen.\n");
469 } 465 }