diff mbox series

[FFmpeg-devel,2/4] avformat/dhav: do not use zero fps

Message ID 20210917195616.25061-2-michael@niedermayer.cc
State Accepted
Commit 71b4d16bca99b5feee33ea9f4eaf2dc6e96f1ed3
Headers show
Series [FFmpeg-devel,1/4] tools/target_dec_fuzzer: Adjust VC1 threshold | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Michael Niedermayer Sept. 17, 2021, 7:56 p.m. UTC 
Fixes: assertion failure
Fixes: 38332/clusterfuzz-testcase-minimized-ffmpeg_dem_DHAV_fuzzer-4522405595316224

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/dhav.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paul B Mahol Sept. 17, 2021, 8:02 p.m. UTC | #1 
lgtm
Michael Niedermayer Sept. 18, 2021, 3:53 p.m. UTC | #2 
On Fri, Sep 17, 2021 at 10:02:25PM +0200, Paul B Mahol wrote:
> lgtm

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavformat/dhav.c b/libavformat/dhav.c
index 5ae39a2a64c..f67b0b89ac9 100644
--- a/libavformat/dhav.c
+++ b/libavformat/dhav.c
@@ -315,7 +315,7 @@  static int64_t get_pts(AVFormatContext *s, int stream_index)
 
         if (diff < 0)
             diff += 65535;
-        if (diff == 0)
+        if (diff == 0 && dhav->frame_rate)
             diff = av_rescale(dhav->frame_number - dst->last_frame_number, 1000, dhav->frame_rate);
         dst->pts += diff;
     } else {