RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make dvenc.c functions static to the unit. 

Also drop some CONFIG_DV_MUXER #ifdefs probably vestigial from before the
split of dvenc and dvdec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f0a8676958)
This commit is contained in:
Diego Elio Pettenò 2011-01-24 23:36:16 +00:00 committed by Michael Niedermayer
parent 295edc7794
commit 81c38db13c
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/dv.h
View File

@ -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 */

10
libavformat/dvenc.c
View File

@ -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 */