Commit f80f7964 authored by Roman Shaposhnik's avatar Roman Shaposhnik

enabling Sun medialib support via --enable-sunmlib, the default

   (even on systems with medialib is to use ffmpeg routines)

Originally committed as revision 2130 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 743739d2
...@@ -100,6 +100,7 @@ risky="yes" ...@@ -100,6 +100,7 @@ risky="yes"
small="no" small="no"
amr_nb="no" amr_nb="no"
amr_nb_fixed="no" amr_nb_fixed="no"
sunmlib="no"
# OS specific # OS specific
targetos=`uname -s` targetos=`uname -s`
...@@ -342,6 +343,8 @@ for opt do ...@@ -342,6 +343,8 @@ for opt do
;; ;;
--enable-amr_nb-fixed) amr_nb_fixed="yes" --enable-amr_nb-fixed) amr_nb_fixed="yes"
;; ;;
--enable-sunmlib) sunmlib="yes"
;;
esac esac
done done
...@@ -754,6 +757,7 @@ echo " --enable-shared-pp use libpostproc.so [default=no]" ...@@ -754,6 +757,7 @@ echo " --enable-shared-pp use libpostproc.so [default=no]"
echo " --enable-shared build shared libraries [default=no]" echo " --enable-shared build shared libraries [default=no]"
echo " --enable-amr_nb enable amr_nb float audio codec" echo " --enable-amr_nb enable amr_nb float audio codec"
echo " --enable-amr_nb-fixed use fixed point for amr-nb codec" echo " --enable-amr_nb-fixed use fixed point for amr-nb codec"
echo " --enable-sunmlib use Sun medialib [default=no]"
echo "" echo ""
echo "Advanced options (experts only):" echo "Advanced options (experts only):"
echo " --source-path=PATH path of source code [$source_path]" echo " --source-path=PATH path of source code [$source_path]"
...@@ -826,6 +830,7 @@ if test "$vhook" = "yes" ; then ...@@ -826,6 +830,7 @@ if test "$vhook" = "yes" ; then
echo "Imlib2 support $imlib2" echo "Imlib2 support $imlib2"
echo "freetype support $freetype2" echo "freetype support $freetype2"
fi fi
echo "Sun medialib support" $sunmlib
echo "AMR-NB float support" $amr_nb echo "AMR-NB float support" $amr_nb
echo "AMR-NB fixed support" $amr_nb_fixed echo "AMR-NB fixed support" $amr_nb_fixed
...@@ -918,6 +923,11 @@ fi ...@@ -918,6 +923,11 @@ fi
if test "$freetype2" = "yes" ; then if test "$freetype2" = "yes" ; then
echo "HAVE_FREETYPE2=yes" >> config.mak echo "HAVE_FREETYPE2=yes" >> config.mak
fi fi
if test "$sunmlib" = "yes" ; then
echo "HAVE_MLIB=yes" >> config.mak
echo "#define HAVE_MLIB 1" >> $TMPH
extralibs="$extralibs -lmlib"
fi
if test "$sdl" = "yes" ; then if test "$sdl" = "yes" ; then
echo "CONFIG_SDL=yes" >> config.mak echo "CONFIG_SDL=yes" >> config.mak
echo "SDL_LIBS=`sdl-config --libs`" >> config.mak echo "SDL_LIBS=`sdl-config --libs`" >> config.mak
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment