|
|
|
@@ -830,12 +830,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code |
|
|
|
return 0; |
|
|
|
|
|
|
|
if ((!codec && !avctx->codec)) { |
|
|
|
av_log(avctx, AV_LOG_ERROR, "No codec provided to avcodec_open2().\n"); |
|
|
|
av_log(avctx, AV_LOG_ERROR, "No codec provided to avcodec_open2()\n"); |
|
|
|
return AVERROR(EINVAL); |
|
|
|
} |
|
|
|
if ((codec && avctx->codec && codec != avctx->codec)) { |
|
|
|
av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " |
|
|
|
"but %s passed to avcodec_open2().\n", avctx->codec->name, codec->name); |
|
|
|
"but %s passed to avcodec_open2()\n", avctx->codec->name, codec->name); |
|
|
|
return AVERROR(EINVAL); |
|
|
|
} |
|
|
|
if (!codec) |
|
|
|
@@ -855,7 +855,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code |
|
|
|
|
|
|
|
entangled_thread_counter++; |
|
|
|
if (entangled_thread_counter != 1) { |
|
|
|
av_log(avctx, AV_LOG_ERROR, "insufficient thread locking around avcodec_open/close()\n"); |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Insufficient thread locking around avcodec_open/close()\n"); |
|
|
|
ret = -1; |
|
|
|
goto end; |
|
|
|
} |
|
|
|
@@ -908,7 +908,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code |
|
|
|
if ((avctx->coded_width || avctx->coded_height || avctx->width || avctx->height) |
|
|
|
&& ( av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx) < 0 |
|
|
|
|| av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0)) { |
|
|
|
av_log(avctx, AV_LOG_WARNING, "ignoring invalid width/height values\n"); |
|
|
|
av_log(avctx, AV_LOG_WARNING, "Ignoring invalid width/height values\n"); |
|
|
|
avcodec_set_dimensions(avctx, 0, 0); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -931,7 +931,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code |
|
|
|
} |
|
|
|
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"); |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Codec type or id mismatches\n"); |
|
|
|
ret = AVERROR(EINVAL); |
|
|
|
goto free_and_end; |
|
|
|
} |
|
|
|
|