X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fivi.c;h=a1eab941d27df12004431fd40eeefa75b4858aa6;hb=38797a8033d061ade58b30b8ac86da222fe42a84;hp=e7799003e60373f4f836720e520d74f15b4f0415;hpb=8cd1323103d3a287eeba5cac32e00cd7314c02bd;p=ffmpeg diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index e7799003e60..a1eab941d27 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -1172,6 +1172,22 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } } + if (ctx->show_indeo4_info) { + if (ctx->is_scalable) + av_log(avctx, AV_LOG_DEBUG, "This video uses scalability mode\n"); + if (ctx->uses_tiling) + av_log(avctx, AV_LOG_DEBUG, "This video uses local decoding\n"); + if (ctx->has_b_frames) + av_log(avctx, AV_LOG_DEBUG, "This video contains B-frames\n"); + if (ctx->has_transp) + av_log(avctx, AV_LOG_DEBUG, "Transparency mode is enabled\n"); + if (ctx->uses_haar) + av_log(avctx, AV_LOG_DEBUG, "This video uses Haar transform\n"); + if (ctx->uses_fullpel) + av_log(avctx, AV_LOG_DEBUG, "This video uses fullpel motion vectors\n"); + ctx->show_indeo4_info = 0; + } + return buf_size; } @@ -1187,23 +1203,6 @@ av_cold int ff_ivi_decode_close(AVCodecContext *avctx) if (ctx->mb_vlc.cust_tab.table) ff_free_vlc(&ctx->mb_vlc.cust_tab); -#if IVI4_STREAM_ANALYSER - if (ctx->is_indeo4) { - if (ctx->is_scalable) - av_log(avctx, AV_LOG_ERROR, "This video uses scalability mode!\n"); - if (ctx->uses_tiling) - av_log(avctx, AV_LOG_ERROR, "This video uses local decoding!\n"); - if (ctx->has_b_frames) - av_log(avctx, AV_LOG_ERROR, "This video contains B-frames!\n"); - if (ctx->has_transp) - av_log(avctx, AV_LOG_ERROR, "Transparency mode is enabled!\n"); - if (ctx->uses_haar) - av_log(avctx, AV_LOG_ERROR, "This video uses Haar transform!\n"); - if (ctx->uses_fullpel) - av_log(avctx, AV_LOG_ERROR, "This video uses fullpel motion vectors!\n"); - } -#endif - av_frame_free(&ctx->p_frame); return 0;