Re: [FFmpeg-devel] [PATCH 2/7] nutdec: Fix repeated condition

2017-10-19 Thread Mark Thompson 
On 19/10/17 00:45, Michael Niedermayer wrote:
> On Tue, Oct 17, 2017 at 11:11:54PM +0100, Mark Thompson wrote:
>> Fixes #6742.
>> ---
>>  libavformat/nutdec.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> ok, also please backport this if this issue was in releases

Sure.  It was introduced by 6621105877ce0d65724a8ab60b3a50160adbe65d, so it's 
in all supported releases (2.8 onwards).

Thanks,

- Mark
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 2/7] nutdec: Fix repeated condition

2017-10-18 Thread Michael Niedermayer 
On Tue, Oct 17, 2017 at 11:11:54PM +0100, Mark Thompson wrote:
> Fixes #6742.
> ---
>  libavformat/nutdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

ok, also please backport this if this issue was in releases

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many things microsoft did are stupid, but not doing something just because
microsoft did it is even more stupid. If everything ms did were stupid they
would be bankrupt already.


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 2/7] nutdec: Fix repeated condition

2017-10-17 Thread Mark Thompson 
Fixes #6742.
---
 libavformat/nutdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 27440c88d4..9910ffe936 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -582,7 +582,7 @@ static int decode_info_header(NUTContext *nut)
 if (stream_id_plus1 && !strcmp(name, "r_frame_rate")) {
 sscanf(str_value, "%d/%d", >r_frame_rate.num, 
>r_frame_rate.den);
 if (st->r_frame_rate.num >= 1000LL*st->r_frame_rate.den ||
-st->r_frame_rate.num < 0 || st->r_frame_rate.num < 0)
+st->r_frame_rate.num < 0 || st->r_frame_rate.den < 0)
 st->r_frame_rate.num = st->r_frame_rate.den = 0;
 continue;
 }
-- 
2.11.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel