[FFmpeg-cvslog] timecode: add avpriv_check_timecode_rate().

Clément Bœsch git at videolan.org
Thu Jan 5 21:00:23 CET 2012


ffmpeg | branch: master | Clément Bœsch <clement.boesch at smartjog.com> | Mon Jan  2 11:53:59 2012 +0100| [2aa7375a9815bebee6e92566fdd1e61cdc312509] | committer: Clément Bœsch

timecode: add avpriv_check_timecode_rate().

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

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

diff --git a/libavcodec/timecode.c b/libavcodec/timecode.c
index 2f7bd64..00b40b7 100644
--- a/libavcodec/timecode.c
+++ b/libavcodec/timecode.c
@@ -55,7 +55,7 @@ uint32_t avpriv_framenum_to_smpte_timecode(unsigned frame, int fps, int drop)
            (  (frame / (fps * 3600) % 24)) % 10;          // units of hours
 }
 
-static int check_timecode_rate(void *avcl, AVRational rate, int drop)
+int avpriv_check_timecode_rate(void *avcl, AVRational rate, int drop)
 {
     int fps;
 
@@ -109,7 +109,7 @@ int avpriv_init_smpte_timecode(void *avcl, struct ff_timecode *tc)
 
     tc->drop  = c != ':'; // drop if ';', '.', ...
 
-    ret = check_timecode_rate(avcl, tc->rate, tc->drop);
+    ret = avpriv_check_timecode_rate(avcl, tc->rate, tc->drop);
     if (ret < 0)
         return ret;
 
diff --git a/libavcodec/timecode.h b/libavcodec/timecode.h
index 3f3c17e..50ea313 100644
--- a/libavcodec/timecode.h
+++ b/libavcodec/timecode.h
@@ -73,6 +73,13 @@ uint32_t avpriv_framenum_to_smpte_timecode(unsigned frame, int fps, int drop);
 char *avpriv_timecode_to_string(char *buf, const struct ff_timecode *tc, unsigned frame);
 
 /**
+ * Check if timecode rate is valid and consistent with the drop flag.
+ *
+ * @return 0 on success, negative value on failure
+ */
+int avpriv_check_timecode_rate(void *avcl, AVRational rate, int drop);
+
+/**
  * Parse SMTPE 12M time representation (hh:mm:ss[:;.]ff). str and rate fields
  * from tc struct must be set.
  *
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 12d9082..ce4259f 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -21,7 +21,7 @@
 #define AVCODEC_VERSION_H
 
 #define LIBAVCODEC_VERSION_MAJOR 53
-#define LIBAVCODEC_VERSION_MINOR 53
+#define LIBAVCODEC_VERSION_MINOR 54
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \



More information about the ffmpeg-cvslog mailing list