From 110d015ad450ea1b2fd40f0e9ce1c53507cdec5d Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 6 Aug 2012 13:50:51 +0200 Subject: Revert "nuv: check per-frame header for validity." The check is bogus since the nuv frameheader is already skipped and the (decompressed) RTjpeg header is checked. This reverts commit f6afacdb3b708720c9fb85984b4f7fdbca2b2036. CC: libav-stable@libav.org --- libavcodec/nuv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 534fd03567..2e01602db7 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -184,9 +184,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, } if (c->codec_frameheader) { int w, h, q; - if (buf[0] != 'V' || buf_size < 12) { - av_log(avctx, AV_LOG_ERROR, "invalid nuv video frame (wrong codec_tag?)\n"); - return AVERROR_INVALIDDATA; + if (buf_size < 12) { + av_log(avctx, AV_LOG_ERROR, "invalid nuv video frame\n"); + return -1; } w = AV_RL16(&buf[6]); h = AV_RL16(&buf[8]); -- cgit v1.2.1