[FFmpeg-cvslog] lavu/timecode: Allow drop frame mode for 60000/1001 fps

[Jason]

ffmpeg | branch: master | Jason <jason at cpcweb.com> | Tue Jan 22 12:31:46 2013 -0500| [a717fa84ede90b7323db2a64f9309da31b0d378f] | committer: Michael Niedermayer

lavu/timecode: Allow drop frame mode for 60000/1001 fps

Reviewed-by: Matthieu Bouron <matthieu.bouron at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/timecode.c |    4 ++--
 libavutil/version.h  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavutil/timecode.c b/libavutil/timecode.c
index 77d828d..5f9ebc2 100644
--- a/libavutil/timecode.c
+++ b/libavutil/timecode.c
@@ -152,8 +152,8 @@ static int check_timecode(void *log_ctx, AVTimecode *tc)
         av_log(log_ctx, AV_LOG_ERROR, "Timecode frame rate must be specified\n");
         return AVERROR(EINVAL);
     }
-    if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30) {
-        av_log(log_ctx, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 FPS\n");
+    if ((tc->flags & AV_TIMECODE_FLAG_DROPFRAME) && tc->fps != 30 && tc->fps != 60) {
+        av_log(log_ctx, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 or 60000/1001 FPS\n");
         return AVERROR(EINVAL);
     }
     if (check_fps(tc->fps) < 0) {
diff --git a/libavutil/version.h b/libavutil/version.h
index 8e678fe..6e81f48 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -76,7 +76,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR  52
 #define LIBAVUTIL_VERSION_MINOR  15
-#define LIBAVUTIL_VERSION_MICRO 102
+#define LIBAVUTIL_VERSION_MICRO 103
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \