[FFmpeg-cvslog] Revert "nuv: check per-frame header for validity."

[Janne Grunau]

ffmpeg | branch: release/0.10 | Janne Grunau <janne-libav at jannau.net> | Mon Aug  6 13:50:51 2012 +0200| [fdb70807817473a02bb02ac918b846a8051bd4bd] | committer: Anton Khirnov

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 at libav.org
(cherry picked from commit 110d015ad450ea1b2fd40f0e9ce1c53507cdec5d)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fdb70807817473a02bb02ac918b846a8051bd4bd
---

 libavcodec/nuv.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 94962b5..7bace2e 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]);