har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf/dv: remove DVMuxContext declaration from dv.h

Browse Source 
DVMuxContext is only used inside dvenc.c, there is no reason for it to
be visible outside of that file.
This commit is contained in:
Anton Khirnov 2022-08-23 10:20:15 +02:00
parent f89949afed
commit dcc4704a4e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/dv.h
View File

@ -1,5 +1,5 @@
/* /*
* General DV muxer/demuxer * General DV demuxer
* Copyright (c) 2003 Roman Shaposhnik * Copyright (c) 2003 Roman Shaposhnik
* *
* Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth * Many thanks to Dan Dennedy <dan@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); int avpriv_dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int, int64_t);
void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset); void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset);
typedef struct DVMuxContext DVMuxContext;
#endif /* AVFORMAT_DV_H */ #endif /* AVFORMAT_DV_H */

4
libavformat/dvenc.c
View File

@ -43,7 +43,7 @@
#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32-bit audio #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32-bit audio
struct DVMuxContext { typedef struct DVMuxContext {
AVClass *av_class; AVClass *av_class;
const AVDVProfile* sys; /* current DV profile, e.g.: 525/60, 625/50 */ const AVDVProfile* sys; /* current DV profile, e.g.: 525/60, 625/50 */
int n_ast; /* number of stereo audio streams (up to 2) */ 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 */ int has_video; /* frame under construction has video */
uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under construction */ uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under construction */
AVTimecode tc; /* timecode context */ AVTimecode tc; /* timecode context */
}; } DVMuxContext;
static const int dv_aaux_packs_dist[12][9] = { static const int dv_aaux_packs_dist[12][9] = {
{ 0xff, 0xff, 0xff, 0x50, 0x51, 0x52, 0x53, 0xff, 0xff }, { 0xff, 0xff, 0xff, 0x50, 0x51, 0x52, 0x53, 0xff, 0xff },