[FFmpeg-cvslog] timecode: more tolerant frame rate check for drop flag.

Clément Bœsch git at videolan.org
Fri Jan 6 12:18:35 CET 2012


ffmpeg | branch: master | Clément Bœsch <clement.boesch at smartjog.com> | Tue Jan  3 17:01:24 2012 +0100| [ed14b7242ae51d74a64eed7687c8680f7882548b] | committer: Clément Bœsch

timecode: more tolerant frame rate check for drop flag.

This fixes some timecode probing in MOV.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed14b7242ae51d74a64eed7687c8680f7882548b
---

 libavcodec/timecode.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/timecode.c b/libavcodec/timecode.c
index 00b40b7..420b276 100644
--- a/libavcodec/timecode.c
+++ b/libavcodec/timecode.c
@@ -64,7 +64,7 @@ int avpriv_check_timecode_rate(void *avcl, AVRational rate, int drop)
         return -1;
     }
     fps = (rate.num + rate.den/2) / rate.den;
-    if (drop && (rate.den != 1001 || fps != 30)) {
+    if (drop && fps != 30) {
         av_log(avcl, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 FPS\n");
         return -2;
     }



More information about the ffmpeg-cvslog mailing list