Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
based on a patch by Luca Abeni < lucabe72 #@# email #.# it > Originally committed as revision 4871 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
1ddf5ba1af
commit
8228bff5c6
@ -56,6 +56,7 @@ unsigned long update_adler32(unsigned long adler, const uint8_t *buf, unsigned i
|
||||
}
|
||||
return (s2 << 16) | s1;
|
||||
}
|
||||
#ifdef CONFIG_MUXERS
|
||||
|
||||
typedef struct CRCState {
|
||||
uint32_t crcval;
|
||||
@ -132,3 +133,4 @@ int crc_init(void)
|
||||
av_register_output_format(&framecrc_format);
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_MUXERS */
|
||||
|
@ -907,6 +907,7 @@ static int dv_read_close(AVFormatContext *s)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MUXERS
|
||||
static int dv_write_header(AVFormatContext *s)
|
||||
{
|
||||
s->priv_data = dv_init_mux(s);
|
||||
@ -944,6 +945,7 @@ static int dv_write_trailer(struct AVFormatContext *s)
|
||||
dv_delete_mux((DVMuxContext *)s->priv_data);
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_MUXERS */
|
||||
|
||||
static AVInputFormat dv_iformat = {
|
||||
"dv",
|
||||
@ -957,6 +959,7 @@ static AVInputFormat dv_iformat = {
|
||||
.extensions = "dv,dif",
|
||||
};
|
||||
|
||||
#ifdef CONFIG_MUXERS
|
||||
static AVOutputFormat dv_oformat = {
|
||||
"dv",
|
||||
"DV video format",
|
||||
@ -969,10 +972,13 @@ static AVOutputFormat dv_oformat = {
|
||||
dv_write_packet,
|
||||
dv_write_trailer,
|
||||
};
|
||||
#endif
|
||||
|
||||
int ff_dv_init(void)
|
||||
{
|
||||
av_register_input_format(&dv_iformat);
|
||||
#ifdef CONFIG_MUXERS
|
||||
av_register_output_format(&dv_oformat);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
@ -291,6 +291,7 @@ static int img_read_close(AVFormatContext *s1)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MUXERS
|
||||
/******************************************************/
|
||||
/* image output */
|
||||
|
||||
@ -360,6 +361,8 @@ static int img_write_trailer(AVFormatContext *s)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_MUXERS */
|
||||
|
||||
/* input */
|
||||
|
||||
static AVInputFormat image2_iformat = {
|
||||
@ -387,6 +390,7 @@ static AVInputFormat image2pipe_iformat = {
|
||||
};
|
||||
|
||||
|
||||
#ifdef CONFIG_MUXERS
|
||||
/* output */
|
||||
|
||||
static AVOutputFormat image2_oformat = {
|
||||
@ -415,14 +419,17 @@ static AVOutputFormat image2pipe_oformat = {
|
||||
img_write_packet,
|
||||
img_write_trailer,
|
||||
};
|
||||
#endif /* CONFIG_MUXERS */
|
||||
|
||||
int img2_init(void)
|
||||
{
|
||||
av_register_input_format(&image2_iformat);
|
||||
av_register_output_format(&image2_oformat);
|
||||
|
||||
av_register_input_format(&image2pipe_iformat);
|
||||
|
||||
#ifdef CONFIG_MUXERS
|
||||
av_register_output_format(&image2_oformat);
|
||||
av_register_output_format(&image2pipe_oformat);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user