Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 218105 | Differences between
and this patch

Collapse All | Expand All

(-)mpeg4ip-1.5.0.1-orig/configure.in (-2 / +2 lines)
Lines 495-502 Link Here
495 
        AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])
 495 
        AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])
496 
        FFMPEG_INC=
 496 
        FFMPEG_INC=
497 
        FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs"
 497 
        FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs"
498 
        AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>])
 498 
        AC_CHECK_TYPES([AVRational], , , [#include <libavcodec/avcodec.h>])
499 
	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>])
 499 
	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <libavcodec/avcodec.h>])
500 
        AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live])
 500 
        AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live])
501 
     fi
 501 
     fi
502 
  fi
 502 
  fi
(-)mpeg4ip-1.5.0.1-orig/player/plugin/audio/ffmpeg/ffmpeg.h (-1 / +1 lines)
Lines 25-31 Link Here
25 
#define __MPEG4IP_FFMPEG_H__ 1
 25 
#define __MPEG4IP_FFMPEG_H__ 1
26 
#include "codec_plugin.h"
 26 
#include "codec_plugin.h"
27 
#ifdef HAVE_FFMPEG_INSTALLED
 27 
#ifdef HAVE_FFMPEG_INSTALLED
28 
#include <ffmpeg/avcodec.h>
 28 
#include <libavcodec/avcodec.h>
29 
#else
 29 
#else
30 
#include <avcodec.h>
 30 
#include <avcodec.h>
31 
#endif
 31 
#endif
(-)mpeg4ip-1.5.0.1-orig/player/plugin/video/ffmpeg/ffmpeg.h (-1 / +1 lines)
Lines 25-31 Link Here
25 
#define __MPEG4IP_FFMPEG_H__ 1
 25 
#define __MPEG4IP_FFMPEG_H__ 1
26 
#include "codec_plugin.h"
 26 
#include "codec_plugin.h"
27 
#ifdef HAVE_FFMPEG_INSTALLED
 27 
#ifdef HAVE_FFMPEG_INSTALLED
28 
#include <ffmpeg/avcodec.h>
 28 
#include <libavcodec/avcodec.h>
29 
#else
 29 
#else
30 
#include <avcodec.h>
 30 
#include <avcodec.h>
31 
#endif
 31 
#endif
(-)mpeg4ip-1.5.0.1-orig/server/mp4live/audio_ffmpeg.h (-1 / +1 lines)
Lines 24-30 Link Here
24 

          24
          

        

        

          25
          
#include "audio_encoder.h"

          25
          
#include "audio_encoder.h"

        

        

          26
          
#ifdef HAVE_FFMPEG_INSTALLED

          26
          
#ifdef HAVE_FFMPEG_INSTALLED

        

          
            

              27
              
#include <ffmpeg/avcodec.h>


              27
              
#include <libavcodec/avcodec.h>

            

        

          28
          
#else

          28
          
#else

        

        

          29
          
#include <avcodec.h>

          29
          
#include <avcodec.h>

        

        

          30
          
#endif

          30
          
#endif

        



(-)mpeg4ip-1.5.0.1-orig/server/mp4live/video_encoder_class.cpp
      (-1 / +1 lines)




  

    
      
            Lines 26-32
          
      
      
        Link Here
      
    
  

        

          26
          
#include "video_util_filter.h"

          26
          
#include "video_util_filter.h"

        

        

          27
          
#ifdef HAVE_FFMPEG

          27
          
#ifdef HAVE_FFMPEG

        

        

          28
          
#ifdef HAVE_FFMPEG_INSTALLED

          28
          
#ifdef HAVE_FFMPEG_INSTALLED

        

          
            

              29
              
#include <ffmpeg/avcodec.h>


              29
              
#include <libavcodec/avcodec.h>

            

        

          30
          
#else

          30
          
#else

        

        

          31
          
#include <avcodec.h>

          31
          
#include <avcodec.h>

        

        

          32
          
#endif

          32
          
#endif

        



(-)mpeg4ip-1.5.0.1-orig/server/mp4live/video_ffmpeg.h
      (-1 / +1 lines)




  

    
      
            Lines 24-30
          
      
      
        Link Here
      
    
  

        

          24
          

          24
          

        

        

          25
          
#include "video_encoder.h"

          25
          
#include "video_encoder.h"

        

        

          26
          
#ifdef HAVE_FFMPEG_INSTALLED

          26
          
#ifdef HAVE_FFMPEG_INSTALLED

        

          
            

              27
              
#include <ffmpeg/avcodec.h>


              27
              
#include <libavcodec/avcodec.h>

            

        

          28
          
#else

          28
          
#else

        

        

          29
          
#include <avcodec.h>

          29
          
#include <avcodec.h>

        

        

          30
          
#endif

          30
          
#endif

        






  

  Return to bug 218105