On 16.12.2015 23:53, Michael Niedermayer wrote:
> On Wed, Dec 16, 2015 at 08:56:55PM +0100, Andreas Cadhalpun wrote:
>> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
>> ---
>> libavformat/nuv.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>
> looks logical iam not nuv maintainer though and i dont know if all
> files have fps set
I don't know that either, so I'm attaching a version of this patch
that permits 0 fps. Which version do you prefer?
Best regards,
Andreas
>From c10ae2a3c40bb93b8209fcb3612cb14e2b968d17 Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
Date: Wed, 16 Dec 2015 20:52:39 +0100
Subject: [PATCH] nuv: reject negative fps rate
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
libavformat/nuv.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 2a1b70f..ba9d2bd 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -172,6 +172,10 @@ static int nuv_header(AVFormatContext *s)
if (aspect > 0.9999 && aspect < 1.0001)
aspect = 4.0 / 3.0;
fps = av_int2double(avio_rl64(pb));
+ if (fps < 0.0f) {
+ av_log(s, AV_LOG_ERROR, "Invalid frame rate %f\n", fps);
+ return AVERROR_INVALIDDATA;
+ }
// number of packets per stream type, -1 means unknown, e.g. streaming
v_packs = avio_rl32(pb);
--
2.6.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
