summaryrefslogtreecommitdiff
path: root/libavformat/libnut.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-02-09 08:28:47 +0000
committerDiego Biurrun <diego@biurrun.de>2007-02-09 08:28:47 +0000
commitd7c592475de81d2129ece1017d7bc8f293b46160 (patch)
treec9ba06c8bf056a28ba893fd21162de79ce81e7bf /libavformat/libnut.c
parent04cfef21ff25e30005d3b2a42bc145324e580a2f (diff)
Properly separate native and libnut NUT (de)muxers.
Originally committed as revision 7891 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/libnut.c')
-rw-r--r--libavformat/libnut.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/libnut.c b/libavformat/libnut.c
index d224d8d5c5..79a6fcaef3 100644
--- a/libavformat/libnut.c
+++ b/libavformat/libnut.c
@@ -123,7 +123,7 @@ static int nut_write_trailer(AVFormatContext * avf) {
return 0;
}
-AVOutputFormat nut_muxer = {
+AVOutputFormat libnut_muxer = {
"nut",
"nut format",
"video/x-nut",
@@ -270,7 +270,7 @@ static int nut_read_close(AVFormatContext *s) {
return 0;
}
-AVInputFormat nut_demuxer = {
+AVInputFormat libnut_demuxer = {
"nut",
"nut format",
sizeof(NUTContext),