[Ffmpeg-devel] [PATCH] lavf-libnut

[Oded Shimon]

$subj

- ods15
-------------- next part --------------
Index: configure
===================================================================
--- configure	(revision 6958)
+++ configure	(working copy)
@@ -31,6 +31,7 @@
   echo "  --incdir=DIR             install includes in DIR [PREFIX/include/ffmpeg]"
   echo "  --mandir=DIR             install man page in DIR [PREFIX/man]"
   echo "  --enable-mp3lame         enable MP3 encoding via libmp3lame [default=no]"
+  echo "  --enable-libnut          enable NUT support via libnut [default=no]"
   echo "  --enable-libogg          enable Ogg support via libogg [default=no]"
   echo "  --enable-vorbis          enable Vorbis support via libvorbis [default=no]"
   echo "  --enable-faad            enable FAAD support via libfaad [default=no]"
@@ -422,6 +423,7 @@
 zlib="yes"
 libgsm="no"
 mp3lame="no"
+libnut="no"
 libogg="no"
 vorbis="no"
 faad="no"
@@ -771,6 +773,8 @@
   ;;
   --enable-mp3lame) mp3lame="yes"
   ;;
+  --enable-libnut) libnut="yes"
+  ;;
   --enable-libogg) libogg="yes"
     pkg_requires="$pkg_requires ogg >= 1.1"
   ;;
@@ -1321,6 +1325,7 @@
 enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
 enabled vorbis  && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg
 enabled libogg  && require libogg ogg/ogg.h ogg_sync_init -logg
+enabled libnut  && require libnut nut.h nut_demuxer_init -lnut
 enabled xvid    && require XviD xvid.h xvid_global -lxvidcore
 enabled x264    && require x264 x264.h x264_encoder_open -lx264
 enabled dc1394  && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
@@ -1599,6 +1604,7 @@
 echo "zlib enabled     $zlib"
 echo "libgsm enabled   $libgsm"
 echo "mp3lame enabled  $mp3lame"
+echo "libnut enabled   $libnut"
 echo "libogg enabled   $libogg"
 echo "Vorbis enabled   $vorbis"
 echo "FAAD enabled     $faad"
@@ -1999,6 +2005,11 @@
   echo "CONFIG_MP3LAME=yes" >> config.mak
 fi
 
+if test "$libnut" = "yes" ; then
+  echo "#define CONFIG_LIBNUT 1" >> $TMPH
+  echo "CONFIG_LIBNUT=yes" >> config.mak
+fi
+
 if test "$libogg" = "yes" ; then
   echo "#define CONFIG_LIBOGG 1" >> $TMPH
   echo "CONFIG_LIBOGG=yes" >> config.mak
Index: libavformat/Makefile
===================================================================
--- libavformat/Makefile	(revision 6958)
+++ libavformat/Makefile	(working copy)
@@ -73,8 +73,6 @@
 OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
 OBJS-$(CONFIG_MXF_DEMUXER)               += mxf.o
 OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.o riff.o
-OBJS-$(CONFIG_NUT_DEMUXER)               += nut.o riff.o
-OBJS-$(CONFIG_NUT_MUXER)                 += nut.o riff.o
 OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
 OBJS-$(CONFIG_OGG_DEMUXER)               += ogg2.o           \
                                             oggparsevorbis.o \
@@ -176,6 +174,14 @@
 endif
 endif
 
+ifeq ($(CONFIG_LIBNUT),yes)
+OBJS-$(CONFIG_NUT_DEMUXER)               += libnut.o riff.o
+OBJS-$(CONFIG_NUT_MUXER)                 += libnut.o riff.o
+else
+OBJS-$(CONFIG_NUT_DEMUXER)               += nut.o riff.o
+OBJS-$(CONFIG_NUT_MUXER)                 += nut.o riff.o
+endif
+
 ifeq ($(CONFIG_LIBOGG),yes)
 OBJS-$(CONFIG_OGG_MUXER)                 += ogg.o
 endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: libnut.c
Type: text/x-csrc
Size: 10003 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20061110/ec848259/attachment.c>