summaryrefslogtreecommitdiff
path: root/libavformat/nut.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-07-10 21:14:37 +0000
committerMåns Rullgård <mans@mansr.com>2006-07-10 21:14:37 +0000
commitff70e60176056daf646109b8e42654a3036fa02b (patch)
tree42e32d1e4bff334964cf93766ff2da6ee9a8f1d3 /libavformat/nut.c
parent4cac0d5589ab1a076e977425925015f2c8e591a8 (diff)
downloadffmpeg-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/nut.c')
-rw-r--r--libavformat/nut.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c
index d3e37ea076..09bd12082d 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -1419,7 +1419,8 @@ static int nut_read_close(AVFormatContext *s)
return 0;
}
-static AVInputFormat nut_demuxer = {
+#ifdef CONFIG_NUT_DEMUXER
+AVInputFormat nut_demuxer = {
"nut",
"nut format",
sizeof(NUTContext),
@@ -1431,9 +1432,9 @@ static AVInputFormat nut_demuxer = {
nut_read_timestamp,
.extensions = "nut",
};
-
-#ifdef CONFIG_MUXERS
-static AVOutputFormat nut_muxer = {
+#endif
+#ifdef CONFIG_NUT_MUXER
+AVOutputFormat nut_muxer = {
"nut",
"nut format",
"video/x-nut",
@@ -1452,13 +1453,4 @@ static AVOutputFormat nut_muxer = {
nut_write_trailer,
.flags = AVFMT_GLOBALHEADER,
};
-#endif //CONFIG_MUXERS
-
-int nut_init(void)
-{
- av_register_input_format(&nut_demuxer);
-#ifdef CONFIG_MUXERS
- av_register_output_format(&nut_muxer);
-#endif //CONFIG_MUXERS
- return 0;
-}
+#endif