generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

timecode: add avpriv_check_timecode_rate().

Browse Source
This commit is contained in:
Clément Bœsch 2012-01-02 11:53:59 +01:00 committed by Clément Bœsch
parent a44b63f6c8
commit 2aa7375a98
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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 ( (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; int fps;
@ -109,7 +109,7 @@ int avpriv_init_smpte_timecode(void *avcl, struct ff_timecode *tc)
tc->drop = c != ':'; // drop if ';', '.', ... 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) if (ret < 0)
return ret; return ret;

7
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); 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 * Parse SMTPE 12M time representation (hh:mm:ss[:;.]ff). str and rate fields
* from tc struct must be set. * from tc struct must be set.

2
libavcodec/version.h
View File

@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H #define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 53 #define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MINOR 53 #define LIBAVCODEC_VERSION_MINOR 54
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \