diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-07-10 21:14:37 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-07-10 21:14:37 +0000 |
| commit | ff70e60176056daf646109b8e42654a3036fa02b (patch) | |
| tree | 42e32d1e4bff334964cf93766ff2da6ee9a8f1d3 /libavformat/yuv4mpeg.c | |
| parent | 4cac0d5589ab1a076e977425925015f2c8e591a8 (diff) | |
| download | ffmpeg-ff70e60176056daf646109b8e42654a3036fa02b.tar.gz | |
allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/yuv4mpeg.c')
| -rw-r--r-- | libavformat/yuv4mpeg.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index be49ff484b..bdfafb1b93 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -27,8 +27,6 @@ struct frame_attributes { int top_field_first; }; -#ifdef CONFIG_MUXERS - static int yuv4_generate_header(AVFormatContext *s, char* buf) { AVStream *st; @@ -171,6 +169,7 @@ static int yuv4_write_trailer(AVFormatContext *s) return 0; } +#ifdef CONFIG_YUV4MPEGPIPE_MUXER AVOutputFormat yuv4mpegpipe_muxer = { "yuv4mpegpipe", "YUV4MPEG pipe format", @@ -184,7 +183,7 @@ AVOutputFormat yuv4mpegpipe_muxer = { yuv4_write_trailer, .flags = AVFMT_RAWPICTURE, }; -#endif //CONFIG_MUXERS +#endif /* Header size increased to allow room for optional flags */ #define MAX_YUV4_HEADER 80 @@ -393,6 +392,7 @@ static int yuv4_probe(AVProbeData *pd) return 0; } +#ifdef CONFIG_YUV4MPEGPIPE_DEMUXER AVInputFormat yuv4mpegpipe_demuxer = { "yuv4mpegpipe", "YUV4MPEG pipe format", @@ -403,13 +403,4 @@ AVInputFormat yuv4mpegpipe_demuxer = { yuv4_read_close, .extensions = "y4m" }; - -int yuv4mpeg_init(void) -{ - av_register_input_format(&yuv4mpegpipe_demuxer); -#ifdef CONFIG_MUXERS - av_register_output_format(&yuv4mpegpipe_muxer); -#endif //CONFIG_MUXERS - return 0; -} - +#endif |