[FFmpeg-devel] [PATCH 02/18] lavf/dv: remove DVMuxContext declaration from dv.h

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Wed Aug 24 14:55:29 EEST 2022


Anton Khirnov:
> DVMuxContext is only used inside dvenc.c, there is no reason for it to
> be visible outside of that file.
> ---
>  libavformat/dv.h    | 4 +---
>  libavformat/dvenc.c | 4 ++--
>  2 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/libavformat/dv.h b/libavformat/dv.h
> index 160c6ab873..efced6ccf0 100644
> --- a/libavformat/dv.h
> +++ b/libavformat/dv.h
> @@ -1,5 +1,5 @@
>  /*
> - * General DV muxer/demuxer
> + * General DV demuxer
>   * Copyright (c) 2003 Roman Shaposhnik
>   *
>   * Many thanks to Dan Dennedy <dan at dennedy.org> for providing wealth
> @@ -36,6 +36,4 @@ int avpriv_dv_get_packet(DVDemuxContext*, AVPacket *);
>  int avpriv_dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int, int64_t);
>  void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset);
>  
> -typedef struct DVMuxContext DVMuxContext;
> -
>  #endif /* AVFORMAT_DV_H */
> diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
> index 7ef9692302..429ddcb96c 100644
> --- a/libavformat/dvenc.c
> +++ b/libavformat/dvenc.c
> @@ -43,7 +43,7 @@
>  
>  #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32-bit audio
>  
> -struct DVMuxContext {
> +typedef struct DVMuxContext {
>      AVClass          *av_class;
>      const AVDVProfile*  sys;           /* current DV profile, e.g.: 525/60, 625/50 */
>      int               n_ast;         /* number of stereo audio streams (up to 2) */
> @@ -55,7 +55,7 @@ struct DVMuxContext {
>      int               has_video;     /* frame under construction has video */
>      uint8_t           frame_buf[DV_MAX_FRAME_SIZE]; /* frame under construction */
>      AVTimecode        tc;            /* timecode context */
> -};
> +} DVMuxContext;
>  
>  static const int dv_aaux_packs_dist[12][9] = {
>      { 0xff, 0xff, 0xff, 0x50, 0x51, 0x52, 0x53, 0xff, 0xff },

LGTM.

- Andreas


More information about the ffmpeg-devel mailing list