From 4029f05c8b0943a5446f254142d5e2bfedb50a0d Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Sat, 10 Sep 2016 12:51:01 -0700 Subject: avcodec/cuvid: Always check for internal errors during parsing The cuvid parser is basically undocumented, and although you'd think that a failed callback would result in the overall parse call returning an error, that is not true. So, we end up silently trying to keep going as if nothing is wrong, which doesn't achieve anything. Solution: check the internal error flag every time. Signed-off-by: Philip Langdale Signed-off-by: Timo Rothenpieler --- libavcodec/cuvid.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'libavcodec/cuvid.c') diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c index de75960ecc..19a7772258 100644 --- a/libavcodec/cuvid.c +++ b/libavcodec/cuvid.c @@ -272,8 +272,13 @@ static int cuvid_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, av_packet_unref(&filtered_packet); if (ret < 0) { - if (ctx->internal_error) - ret = ctx->internal_error; + goto error; + } + + // cuvidParseVideoData doesn't return an error just because stuff failed... + if (ctx->internal_error) { + av_log(avctx, AV_LOG_ERROR, "cuvid decode callback error\n"); + ret = ctx->internal_error; goto error; } -- cgit v1.2.3