DVMuxContext is only used inside dvenc.c, there is no reason for it to be visible outside of that file.
Showing the changes to libavformat (2 of 2 files). Show all
Unified · Split
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * General DV muxer/demuxer | 2 | * General DV demuxer |
| 3 | * Copyright (c) 2003 Roman Shaposhnik | 3 | * Copyright (c) 2003 Roman Shaposhnik |
| 4 | * | 4 | * |
| 5 | * Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth | 5 | * Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth |
| @@ -36,6 +36,4 @@ int avpriv_dv_get_packet(DVDemuxContext*, AVPacket *); · 30 unmodified lines | |||
| 36 | int avpriv_dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int, int64_t); | 36 | int avpriv_dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int, int64_t); |
| 37 | void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset); | 37 | void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset); |
| 38 | 38 | ||
| 39 | typedef struct DVMuxContext DVMuxContext; | ||
| 40 | |||
| 41 | #endif /* AVFORMAT_DV_H */ | 39 | #endif /* AVFORMAT_DV_H */ |
| @@ -43,7 +43,7 @@ · 42 unmodified lines | |||
| 43 | 43 | ||
| 44 | #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32-bit audio | 44 | #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32-bit audio |
| 45 | 45 | ||
| 46 | struct DVMuxContext { | 46 | typedef struct DVMuxContext { |
| 47 | AVClass *av_class; | 47 | AVClass *av_class; |
| 48 | const AVDVProfile* sys; /* current DV profile, e.g.: 525/60, 625/50 */ | 48 | const AVDVProfile* sys; /* current DV profile, e.g.: 525/60, 625/50 */ |
| 49 | int n_ast; /* number of stereo audio streams (up to 2) */ | 49 | int n_ast; /* number of stereo audio streams (up to 2) */ |
| @@ -55,7 +55,7 @@ struct DVMuxContext { · 5 unmodified lines | |||
| 55 | int has_video; /* frame under construction has video */ | 55 | int has_video; /* frame under construction has video */ |
| 56 | uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under construction */ | 56 | uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under construction */ |
| 57 | AVTimecode tc; /* timecode context */ | 57 | AVTimecode tc; /* timecode context */ |
| 58 | }; | 58 | } DVMuxContext; |
| 59 | 59 | ||
| 60 | static const int dv_aaux_packs_dist[12][9] = { | 60 | static const int dv_aaux_packs_dist[12][9] = { |
| 61 | { 0xff, 0xff, 0xff, 0x50, 0x51, 0x52, 0x53, 0xff, 0xff }, | 61 | { 0xff, 0xff, 0xff, 0x50, 0x51, 0x52, 0x53, 0xff, 0xff }, |