ffmpeg: Add sanity check on frame duplication
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jul 2012 01:48:36 +0000 (03:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jul 2012 02:17:00 +0000 (04:17 +0200)
This prevents long loops and OOM in case of damaged timestamps in some
cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c

index 25112d3..a19f207 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1770,6 +1770,11 @@ static void do_video_out(AVFormatContext *s,
         av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
         return;
     } else if (nb_frames > 1) {
         av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
         return;
     } else if (nb_frames > 1) {
+        if (nb_frames > dts_error_threshold * 30) {
+            av_log(NULL, AV_LOG_ERROR, "%d frame duplication too large, skiping\n", nb_frames - 1);
+            nb_frames_drop++;
+            return;
+        }
         nb_frames_dup += nb_frames - 1;
         av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames - 1);
     }
         nb_frames_dup += nb_frames - 1;
         av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames - 1);
     }