View | Details | Raw Unified
Collapse All | Expand All

(-) qemacs-0.3.1/image.c (-20 / +5 lines)
 Lines 139-147   for opt do Link Here  
  ;;
  ;;
  --disable-plugins) plugins="no"
  --disable-plugins) plugins="no"
  ;;
  ;;
  --with-ffmpegdir=*)  ffmpeg_srcdir=${opt#--with-ffmpegdir=} ; ffmpeg="yes"
 
  --enable-ffmpeg) ffmpeg="yes"
 
  ;;
 

            

            

              
  --with-ffmpeglibdir=*)  ffmpeg_libdir=${opt#--with-ffmpeglibdir=}

              

            

        
  ;;
  ;;

        
  esac
  esac

        
done
done

  

    

    

       Lines 190-201
      EOF 
    
  Link Here 
    

  

        
$cc -o $TMPO $TMPC 2> /dev/null || _memalign=no
$cc -o $TMPO $TMPC 2> /dev/null || _memalign=no

        
fi
fi

        

            

              
if test "$ffmpeg" = "yes" ; then

              
            

            

              
    if test -z "$ffmpeg_libdir" ; then

              
            

            

              
        ffmpeg_libdir="$ffmpeg_srcdir"

              
            

            

              
    fi

              
            

            

              
fi

              
            

            

              

              
            

        
if test "$tiny" = "yes" ; then
if test "$tiny" = "yes" ; then

        
    x11="no"
    x11="no"

        
    ffmpeg="no"
    ffmpeg="no"

  

    

    

       Lines 240-254
      echo "  --enable-tiny            build a 
    
  Link Here 
    

  

        
echo "  --disable-html           disable graphical html support"
echo "  --disable-html           disable graphical html support"

        
echo "  --disable-png            disable png support"
echo "  --disable-png            disable png support"

        
echo "  --disable-plugins        disable plugins support"
echo "  --disable-plugins        disable plugins support"

            

              
echo "  --with-ffmpegdir=DIR     find ffmpeg sources and libraries in DIR"

              
echo "  --enable-ffmpegdir       enable-ffmpeg support"

            

            

              
echo "                           for audio/video/image support"

              

            

        
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]"

        
echo "  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]"
echo "  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]"

        
echo "  --cc=CC                  use C compiler CC [$cc]"
echo "  --cc=CC                  use C compiler CC [$cc]"

        
echo "  --make=MAKE              use specified make [$make]"
echo "  --make=MAKE              use specified make [$make]"

            

              
echo "  --with-ffmpeglibdir=DIR  set ffmpeg object files directory"

              
            

        
echo ""
echo ""

        
echo "NOTE: The object files are build at the place where configure is launched"
echo "NOTE: The object files are build at the place where configure is launched"

        
exit 1
exit 1

  

    

    

       Lines 361-368
      fi 
    
  Link Here 
    

  

        
if test "$ffmpeg" = "yes" ; then
if test "$ffmpeg" = "yes" ; then

        
  echo "#define CONFIG_FFMPEG 1" >> $TMPH
  echo "#define CONFIG_FFMPEG 1" >> $TMPH

        
  echo "CONFIG_FFMPEG=yes" >> config.mak
  echo "CONFIG_FFMPEG=yes" >> config.mak

            

              
  echo "FFMPEG_SRCDIR=$ffmpeg_srcdir" >> config.mak

              
            

            

              
  echo "FFMPEG_LIBDIR=$ffmpeg_libdir" >> config.mak

              
            

        
fi
fi

        

        
# build tree in object directory if source path is different from current one
# build tree in object directory if source path is different from current one

  

    

    

       Lines 128-137
      endif 
    
  Link Here 
    

  

        

        
ifdef CONFIG_FFMPEG
ifdef CONFIG_FFMPEG

        
OBJS+= video.o image.o
OBJS+= video.o image.o

            

              
DEP_LIBS+=$(FFMPEG_LIBDIR)/libavcodec/libavcodec.a $(FFMPEG_LIBDIR)/libavformat/libavformat.a

              
LIBS+=  -lavformat -lavcodec -lz -lpthread

            

            

              
LIBS+=  -L$(FFMPEG_LIBDIR)/libavcodec -L$(FFMPEG_LIBDIR)/libavformat -lavformat -lavcodec -lz -lpthread

              

            

            

              
DEFINES+= -I$(FFMPEG_SRCDIR)/libavcodec -I$(FFMPEG_SRCDIR)/libavformat

              

            

            

              
TARGETS+=ffplay

              

            

        
endif
endif

        

        
# must be the last object
# must be the last object

  

    

    

       Lines 17-23
       
    
  Link Here 
    

  

        
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

        
 */
 */

        
#include "qe.h"
#include "qe.h"

            

              
#include "avformat.h"

              
#include "ffmpeg/avformat.h"

            

        
#include <pthread.h>
#include <pthread.h>

        
#include <math.h>
#include <math.h>

        

  

    

    

       Lines 17-23
       
    
  Link Here 
    

  

        
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

        
 */
 */

        
#include "qe.h"
#include "qe.h"

            

              
#include "avformat.h"

              
#include "ffmpeg/avformat.h"

            

        

        
typedef struct ImageBuffer {
typedef struct ImageBuffer {

        
    int pix_fmt;
    int pix_fmt;