Revision d7c59247

View differences:

configure
562 562
dc1394_demuxer_deps="dc1394"
563 563
dv1394_demuxer_deps="dv1394"
564 564
gxf_muxer_deps="gpl"
565
nut_muxer_deps="libnut"
565
libnut_demuxer_deps="libnut"
566
libnut_muxer_deps="libnut"
566 567
ogg_muxer_deps="libogg"
567 568
redir_demuxer_deps="network"
568 569
rtp_muxer_deps="network"
libavformat/Makefile
165 165
endif
166 166
endif
167 167

  
168
ifeq ($(CONFIG_LIBNUT),yes)
169
OBJS-$(CONFIG_NUT_DEMUXER)               += libnut.o riff.o
170
OBJS-$(CONFIG_NUT_MUXER)                 += libnut.o riff.o
171
else
168
OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o riff.o
169
OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
170

  
172 171
OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o riff.o
173 172
#OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o riff.o
174
endif
175 173

  
176 174
NAME=avformat
177 175
ifeq ($(BUILD_SHARED),yes)
libavformat/allformats.c
83 83
    REGISTER_MUXDEMUX(IMAGE2PIPE, image2pipe);
84 84
    REGISTER_DEMUXER (INGENIENT, ingenient);
85 85
    REGISTER_DEMUXER (IPMOVIE, ipmovie);
86
    if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
87
    REGISTER_MUXER   (LIBNUT, libnut);
86 88
    REGISTER_MUXDEMUX(M4V, m4v);
87 89
    REGISTER_DEMUXER (MATROSKA, matroska);
88 90
    REGISTER_MUXDEMUX(MJPEG, mjpeg);
......
109 111
    REGISTER_DEMUXER (NSV, nsv);
110 112
    REGISTER_MUXER   (NULL, null);
111 113
    REGISTER_DEMUXER (NUT, nut);
112
    REGISTER_MUXER   (NUT, nut);
113 114
    REGISTER_DEMUXER (NUV, nuv);
114 115
    REGISTER_DEMUXER (OGG, ogg);
115 116
    REGISTER_MUXER   (OGG, ogg);
libavformat/allformats.h
69 69
extern AVOutputFormat image_muxer;
70 70
extern AVOutputFormat imagepipe_muxer;
71 71
extern AVInputFormat ipmovie_demuxer;
72
extern AVInputFormat libnut_demuxer;
73
extern AVOutputFormat libnut_muxer;
72 74
extern AVInputFormat matroska_demuxer;
73 75
extern AVInputFormat mm_demuxer;
74 76
extern AVInputFormat mmf_demuxer;
......
96 98
extern AVInputFormat mxf_demuxer;
97 99
extern AVInputFormat nsv_demuxer;
98 100
extern AVInputFormat nut_demuxer;
99
extern AVOutputFormat nut_muxer;
100 101
extern AVInputFormat nuv_demuxer;
101 102
extern AVInputFormat ogg_demuxer;
102 103
extern AVOutputFormat ogg_muxer;
libavformat/libnut.c
123 123
    return 0;
124 124
}
125 125

  
126
AVOutputFormat nut_muxer = {
126
AVOutputFormat libnut_muxer = {
127 127
    "nut",
128 128
    "nut format",
129 129
    "video/x-nut",
......
270 270
    return 0;
271 271
}
272 272

  
273
AVInputFormat nut_demuxer = {
273
AVInputFormat libnut_demuxer = {
274 274
    "nut",
275 275
    "nut format",
276 276
    sizeof(NUTContext),

Also available in: Unified diff