[FFmpeg-devel] [PATCH 12/12] timecode: drop lavc timecode on next bump.

[Stefano Sabatini]

On date Monday 2012-01-23 17:04:31 +0100, Clément Bœsch encoded:
> From: Clément Bœsch <clement.boesch at smartjog.com>
> 
> ---
>  libavcodec/timecode.c |    6 +++++-
>  libavcodec/timecode.h |    6 +++++-
>  2 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/timecode.c b/libavcodec/timecode.c
> index 2e0f4a4..f9862e5 100644
> --- a/libavcodec/timecode.c
> +++ b/libavcodec/timecode.c
> @@ -22,8 +22,13 @@
>  /**
>   * @file
>   * Timecode helpers
> + * This *private* API is deprecated, please use the one available in libavutil instead.
>   */
>  
> +#include "version.h"
> +
> +#if FF_API_OLD_TIMECODE
> +
>  #include <stdio.h>
>  #include "timecode.h"
>  #include "libavutil/log.h"
> @@ -128,7 +133,6 @@ int avpriv_init_smpte_timecode(void *avcl, struct ff_timecode *tc)
>      return 0;
>  }
>  
> -#if FF_API_OLD_TIMECODE
>  int ff_framenum_to_drop_timecode(int frame_num)
>  {
>      return avpriv_framenum_to_drop_timecode(frame_num);
> diff --git a/libavcodec/timecode.h b/libavcodec/timecode.h
> index bcfb0fa..8bc69e9 100644
> --- a/libavcodec/timecode.h
> +++ b/libavcodec/timecode.h
> @@ -22,11 +22,16 @@
>  /**
>   * @file
>   * Timecode helpers header
> + * This *private* API is deprecated, please use the one available in libavutil instead.
>   */
>  
>  #ifndef AVCODEC_TIMECODE_H
>  #define AVCODEC_TIMECODE_H
>  
> +#include "version.h"
> +
> +#if FF_API_OLD_TIMECODE
> +
>  #include <stdint.h>
>  #include "avcodec.h"
>  #include "libavutil/rational.h"
> @@ -93,7 +98,6 @@ int avpriv_check_timecode_rate(void *avcl, AVRational rate, int drop);
>   */
>  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);
> -- 
> 1.7.8.3

Should be fine (a test can't hurt though).
-- 
FFmpeg = Faithful and Frightening Moronic Purposeless Egregious Game