diff options
| author | Clément Bœsch <clement.boesch@smartjog.com> | 2012-01-02 11:53:59 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-01-05 20:59:52 +0100 |
| commit | 2aa7375a9815bebee6e92566fdd1e61cdc312509 (patch) | |
| tree | 18c45ed5c7d6aa0cd51212f5e7dbc3f862470737 | |
| parent | a44b63f6c8bee7cb08f4b96408ce4f5a39326097 (diff) | |
| download | ffmpeg-2aa7375a9815bebee6e92566fdd1e61cdc312509.tar.gz | |
timecode: add avpriv_check_timecode_rate().
| -rw-r--r-- | libavcodec/timecode.c | 4 | ||||
| -rw-r--r-- | libavcodec/timecode.h | 7 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libavcodec/timecode.c b/libavcodec/timecode.c index 2f7bd64e39..00b40b7bcf 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 3f3c17e612..50ea313afa 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 12d9082802..ce4259f99b 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, \ |