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

[Stefano Sabatini]

On date Monday 2012-01-16 17:30:14 +0100, Clément Bœsch encoded:
> From: Clément Bœsch <clement.boesch at smartjog.com>
> 
> ---
>  libavcodec/timecode.c |    3 ++-
>  libavcodec/timecode.h |    3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/timecode.c b/libavcodec/timecode.c
> index 2e0f4a4..94739bc 100644
> --- a/libavcodec/timecode.c
> +++ b/libavcodec/timecode.c
> @@ -24,6 +24,8 @@
>   * Timecode helpers
>   */
>  
> +#if FF_API_OLD_TIMECODE
> +
>  #include <stdio.h>
>  #include "timecode.h"
>  #include "libavutil/log.h"

Not sure, maybe you should include at least version.h, so the
preprocessor knows how to do the check without depending on other
includes.

> @@ -128,7 +130,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..8a12057 100644
> --- a/libavcodec/timecode.h
> +++ b/libavcodec/timecode.h
> @@ -27,6 +27,8 @@
>  #ifndef AVCODEC_TIMECODE_H
>  #define AVCODEC_TIMECODE_H
>  
> +#if FF_API_OLD_TIMECODE
> +
>  #include <stdint.h>
>  #include "avcodec.h"
>  #include "libavutil/rational.h"
> @@ -93,7 +95,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.7.3

Looks fine otherwise.
-- 
FFmpeg = Friendly Funny Mournful Perennial Extroverse Gorilla