[FFmpeg-cvslog] nutdec: check for negative frame rate in decode_info_header
ffmpeg | branch: release/2.2 | Andreas Cadhalpun
andreas.cadhal...@googlemail.com | Tue Apr 28 20:31:56 2015 +0200|
[b548a6208eed898599bca0bf7979ba1d03932183] | committer: Michael Niedermayer
nutdec: check for negative frame rate in decode_info_header
A negative frame rate triggers an av_assert2 in av_rescale_rnd.
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 6621105877ce0d65724a8ab60b3a50160adbe65d)
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b548a6208eed898599bca0bf7979ba1d03932183
---
libavformat/nutdec.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index a63de7d..dbf8df3 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -560,7 +560,8 @@ static int decode_info_header(NUTContext *nut)
if (stream_id_plus1 !strcmp(name, r_frame_rate)) {
sscanf(str_value, %d/%d, st-r_frame_rate.num,
st-r_frame_rate.den);
-if (st-r_frame_rate.num = 1000LL*st-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 = st-r_frame_rate.den = 0;
continue;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] nutdec: check for negative frame rate in decode_info_header
ffmpeg | branch: release/2.4 | Andreas Cadhalpun
andreas.cadhal...@googlemail.com | Tue Apr 28 20:31:56 2015 +0200|
[e0ef1b8c0b21122850458d1c2c229d8bd852a74d] | committer: Michael Niedermayer
nutdec: check for negative frame rate in decode_info_header
A negative frame rate triggers an av_assert2 in av_rescale_rnd.
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 6621105877ce0d65724a8ab60b3a50160adbe65d)
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0ef1b8c0b21122850458d1c2c229d8bd852a74d
---
libavformat/nutdec.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 6fff2bb..def8984 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -575,7 +575,8 @@ static int decode_info_header(NUTContext *nut)
if (stream_id_plus1 !strcmp(name, r_frame_rate)) {
sscanf(str_value, %d/%d, st-r_frame_rate.num,
st-r_frame_rate.den);
-if (st-r_frame_rate.num = 1000LL*st-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 = st-r_frame_rate.den = 0;
continue;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] nutdec: check for negative frame rate in decode_info_header
ffmpeg | branch: release/2.5 | Andreas Cadhalpun
andreas.cadhal...@googlemail.com | Tue Apr 28 20:31:56 2015 +0200|
[b8627a63d89b578fce60767158ee20565210d0b4] | committer: Michael Niedermayer
nutdec: check for negative frame rate in decode_info_header
A negative frame rate triggers an av_assert2 in av_rescale_rnd.
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 6621105877ce0d65724a8ab60b3a50160adbe65d)
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8627a63d89b578fce60767158ee20565210d0b4
---
libavformat/nutdec.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index ef29bdf..287496e 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -553,7 +553,8 @@ static int decode_info_header(NUTContext *nut)
if (stream_id_plus1 !strcmp(name, r_frame_rate)) {
sscanf(str_value, %d/%d, st-r_frame_rate.num,
st-r_frame_rate.den);
-if (st-r_frame_rate.num = 1000LL*st-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 = st-r_frame_rate.den = 0;
continue;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] nutdec: check for negative frame rate in decode_info_header
ffmpeg | branch: release/2.6 | Andreas Cadhalpun
andreas.cadhal...@googlemail.com | Tue Apr 28 20:31:56 2015 +0200|
[a13a288ec810027f0c1f23bb1385a85d3c554db5] | committer: Andreas Cadhalpun
nutdec: check for negative frame rate in decode_info_header
A negative frame rate triggers an av_assert2 in av_rescale_rnd.
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 6621105877ce0d65724a8ab60b3a50160adbe65d)
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a13a288ec810027f0c1f23bb1385a85d3c554db5
---
libavformat/nutdec.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 00e86bb..65d799e 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -553,7 +553,8 @@ static int decode_info_header(NUTContext *nut)
if (stream_id_plus1 !strcmp(name, r_frame_rate)) {
sscanf(str_value, %d/%d, st-r_frame_rate.num,
st-r_frame_rate.den);
-if (st-r_frame_rate.num = 1000LL*st-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 = st-r_frame_rate.den = 0;
continue;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
