diff options
| author | Clément Bœsch <clement.boesch@smartjog.com> | 2011-12-07 13:44:50 +0400 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2011-12-12 20:49:34 +0400 |
| commit | 80914cde6f2b5d6584c74bad6b3613d16dfbda67 (patch) | |
| tree | bd6fee73a0ebaae4974e70b09193b8ee24f09236 /libavcodec/timecode.h | |
| parent | fa4e30af7e589c27437d2b96a384d4ad1c3485ad (diff) | |
timecode: rename internal ff_* symbols to avpriv_*.
Those functions are shared between libs.
Also fix a typo in function names: smtpe → smpte.
Diffstat (limited to 'libavcodec/timecode.h')
| -rw-r--r-- | libavcodec/timecode.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libavcodec/timecode.h b/libavcodec/timecode.h index 7bbd1ead62..3f3c17e612 100644 --- a/libavcodec/timecode.h +++ b/libavcodec/timecode.h @@ -28,6 +28,7 @@ #define AVCODEC_TIMECODE_H #include <stdint.h> +#include "avcodec.h" #include "libavutil/rational.h" #define TIMECODE_OPT(ctx, flags) \ @@ -49,7 +50,7 @@ struct ff_timecode { * @return Adjusted frame number * @warning Adjustment is only valid in NTSC 29.97 */ -int ff_framenum_to_drop_timecode(int frame_num); +int avpriv_framenum_to_drop_timecode(int frame_num); /** * @brief Convert frame id (timecode) to SMPTE 12M binary representation @@ -58,7 +59,7 @@ int ff_framenum_to_drop_timecode(int frame_num); * @param drop Drop flag * @return The actual binary representation */ -uint32_t ff_framenum_to_smtpe_timecode(unsigned frame, int fps, int drop); +uint32_t avpriv_framenum_to_smpte_timecode(unsigned frame, int fps, int drop); /** * @brief Load timecode string in buf @@ -81,6 +82,12 @@ char *avpriv_timecode_to_string(char *buf, const struct ff_timecode *tc, unsigne * @return 0 on success, negative value on failure * @warning Adjustement is only valid in NTSC 29.97 */ -int ff_init_smtpe_timecode(void *avcl, struct ff_timecode *tc); +int avpriv_init_smpte_timecode(void *avcl, struct ff_timecode *tc); + +#if FF_API_OLD_TIMECODE +attribute_deprecated int ff_framenum_to_drop_timecode(int frame_num); +attribute_deprecated uint32_t ff_framenum_to_smtpe_timecode(unsigned frame, int fps, int drop); +attribute_deprecated int ff_init_smtpe_timecode(void *avcl, struct ff_timecode *tc); +#endif #endif /* AVCODEC_TIMECODE_H */ |