[FFmpeg-devel] [PATCH 08/11] Make dvenc.c functions static to the unit.

[Janne Grunau]

On Tue, Jan 25, 2011 at 12:36:16AM +0100, Diego Elio Petten? wrote:
> Also drop some CONFIG_DV_MUXER #ifdefs probably vestigial from before the
> split of dvenc and dvdec.
> ---
>  libavformat/dv.h    |    3 ---
>  libavformat/dvenc.c |   10 ++++------
>  2 files changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/libavformat/dv.h b/libavformat/dv.h
> index ae16bef..b8b43f1 100644
> --- a/libavformat/dv.h
> +++ b/libavformat/dv.h
> @@ -37,8 +37,5 @@ int dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int);
>  void dv_offset_reset(DVDemuxContext *c, int64_t frame_offset);
>  
>  typedef struct DVMuxContext DVMuxContext;
> -DVMuxContext* dv_init_mux(AVFormatContext* s);
> -int dv_assemble_frame(DVMuxContext *c, AVStream*, uint8_t*, int, uint8_t**);
> -void dv_delete_mux(DVMuxContext*);
>  
>  #endif /* AVFORMAT_DV_H */
> diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
> index 0176ac9..e48d8d0 100644
> --- a/libavformat/dvenc.c
> +++ b/libavformat/dvenc.c
> @@ -232,8 +232,8 @@ static void dv_inject_metadata(DVMuxContext *c, uint8_t* frame)
>   * The following 3 functions constitute our interface to the world
>   */
>  
> -int dv_assemble_frame(DVMuxContext *c, AVStream* st,
> -                      uint8_t* data, int data_size, uint8_t** frame)
> +static int dv_assemble_frame(DVMuxContext *c, AVStream* st,
> +                             uint8_t* data, int data_size, uint8_t** frame)
>  {
>      int i, reqasize;
>  
> @@ -285,7 +285,7 @@ int dv_assemble_frame(DVMuxContext *c, AVStream* st,
>      return 0;
>  }
>  
> -DVMuxContext* dv_init_mux(AVFormatContext* s)
> +static DVMuxContext* dv_init_mux(AVFormatContext* s)
>  {
>      DVMuxContext *c = s->priv_data;
>      AVStream *vst = NULL;
> @@ -354,14 +354,13 @@ bail_out:
>      return NULL;
>  }
>  
> -void dv_delete_mux(DVMuxContext *c)
> +static void dv_delete_mux(DVMuxContext *c)
>  {
>      int i;
>      for (i=0; i < c->n_ast; i++)
>          av_fifo_free(c->audio_data[i]);
>  }
>  
> -#if CONFIG_DV_MUXER
>  static int dv_write_header(AVFormatContext *s)
>  {
>      if (!dv_init_mux(s)) {
> @@ -412,4 +411,3 @@ AVOutputFormat dv_muxer = {
>      dv_write_packet,
>      dv_write_trailer,
>  };
> -#endif /* CONFIG_DV_MUXER */

ok

Janne