Browse Source

timecode: add avpriv_check_timecode_rate().

tags/n0.10
Clément Bœsch Clément Bœsch 14 years ago
parent
commit
2aa7375a98
3 changed files with 10 additions and 3 deletions
  1. +2
    -2
      libavcodec/timecode.c
  2. +7
    -0
      libavcodec/timecode.h
  3. +1
    -1
      libavcodec/version.h

+ 2
- 2
libavcodec/timecode.c View File

@@ -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;



+ 7
- 0
libavcodec/timecode.h View File

@@ -72,6 +72,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.


+ 1
- 1
libavcodec/version.h View File

@@ -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, \


Loading…
Cancel
Save