github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 06:03:45 +01:00
Code Releases Activity

FFmpeg now uses different (unified) #include paths.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-02-25 15:46:36 +00:00
parent 9c30916c7a
commit 21c200e767
29 changed files with 28 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -6363,7 +6363,7 @@ if test "$_libavutil_a" = auto ; then
elif test "$_libavutil_so" = auto ; then
_libavutil_so=no
cat > $TMPC << EOF
#include <ffmpeg/common.h>
#include <libavutil/common.h>
int main(void) { ff_gcd(1,1); return 0; }
EOF
if $_pkg_config --exists libavutil ; then
@ -6402,7 +6402,7 @@ elif test "$_libavcodec_so" = auto ; then
_libavcodec_so=no
_res_comment="libavcodec.so is discouraged over static libavcodec"
cat > $TMPC << EOF
#include <ffmpeg/avcodec.h>
#include <libavcodec/avcodec.h>
int main(void) { avcodec_find_encoder_by_name(""); return 0; }
EOF
if $_pkg_config --exists libavcodec ; then
@ -6445,8 +6445,8 @@ if test "$_libavformat_a" = auto ; then
elif test "$_libavformat_so" = auto ; then
_libavformat_so=no
cat > $TMPC <<EOF
#include <ffmpeg/avformat.h>
#include <ffmpeg/opt.h>
#include <libavformat/avformat.h>
#include <libavcodec/opt.h>
int main(void) { av_alloc_format_context(); return 0; }
EOF
if $_pkg_config --exists libavformat ; then
@ -6483,7 +6483,7 @@ elif test "$_libpostproc_so" = auto ; then
cat > $TMPC << EOF
#define USE_LIBPOSTPROC 1
#include <inttypes.h>
#include <postproc/postprocess.h>
#include <libpostproc/postprocess.h>
int main(void) { pp_get_mode_by_name_and_quality("de", 0); return 0; }
EOF
if cc_check -lpostproc $_ld_lm ; then

6
fmt-conversion.h
View File

@ -1,11 +1,7 @@
#ifndef MPLAYER_FMT_CONVERSION_H
#define MPLAYER_FMT_CONVERSION_H
#ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/avutil.h>
#else
#include "avutil.h"
#endif
#include "libavutil/avutil.h"
#include "img_format.h"
enum PixelFormat imgfmt2pixfmt(int fmt)

4
gui/bitmap.c
View File

@ -5,11 +5,7 @@
#include "mp_msg.h"
#include "help_mp.h"
#include "bitmap.h"
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#else
#include "libavcodec/avcodec.h"
#endif
#include "libavutil/intreadwrite.h"
#include "libvo/fastmemcpy.h"

10
libaf/af_lavcresample.c
View File

@ -25,14 +25,8 @@
#include "config.h"
#include "af.h"
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#include <ffmpeg/rational.h>
#else
#include "avcodec.h"
#include "rational.h"
#endif
#include "libavcodec/avcodec.h"
#include "libavutil/rational.h"
// Data for specific instances of this filter
typedef struct af_resample_s{

6
libmpcodecs/ad_ffmpeg.c
View File

@ -24,11 +24,7 @@ LIBAD_EXTERN(ffmpeg)
#define assert(x)
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#else
#include "avcodec.h"
#endif
#include "libavcodec/avcodec.h"
extern int avcodec_initialized;

8
libmpcodecs/ae_lavc.c
View File

@ -15,11 +15,7 @@
#include "config.h"
#include "libaf/af_format.h"
#include "libaf/reorder_ch.h"
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#else
#include "libavcodec/avcodec.h"
#endif
static AVCodec *lavc_acodec;
static AVCodecContext *lavc_actx;
@ -30,11 +26,7 @@ extern int lavc_param_audio_global_header;
extern int avcodec_initialized;
static int compressed_frame_size = 0;
#ifdef USE_LIBAVFORMAT
#ifdef USE_LIBAVFORMAT_SO
#include <ffmpeg/avformat.h>
#else
#include "libavformat/avformat.h"
#endif
extern const struct AVCodecTag *mp_wav_taglists[];
#endif

4
libmpcodecs/native/nuppelvideo.c
View File

@ -20,11 +20,7 @@
#include "libmpdemux/nuppelvideo.h"
#include "RTjpegN.h"
#ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/lzo.h>
#else
#include "libavutil/lzo.h"
#endif
#define KEEP_BUFFER

4
libmpcodecs/vd_ffmpeg.c
View File

@ -23,11 +23,7 @@ static vd_info_t info = {
LIBVD_EXTERN(ffmpeg)
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#else
#include "libavcodec/avcodec.h"
#endif
#ifdef HAVE_XVMC
#include "xvmc_render.h"

5
libmpcodecs/vd_lzo.c
View File

@ -5,12 +5,7 @@
#include "mp_msg.h"
#include "vd_internal.h"
#ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/lzo.h>
#else
#include "libavutil/lzo.h"
#endif
#define MOD_NAME "DecLZO"

4
libmpcodecs/ve_lavc.c
View File

@ -30,11 +30,7 @@ extern char* passtmpfile;
//===========================================================================//
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#else
#include "libavcodec/avcodec.h"
#endif
extern int avcodec_initialized;

7
libmpcodecs/ve_xvid4.c
View File

@ -55,12 +55,7 @@
#include <assert.h>
#include "m_option.h"
#ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/avutil.h>
#else
#include "avutil.h"
#endif
#include "libavutil/avutil.h"
#define FINE (!0)
#define BAD (!FINE)

5
libmpcodecs/vf_lavc.c
View File

@ -10,12 +10,7 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#else
#include "libavcodec/avcodec.h"
#endif
extern int avcodec_initialized;

5
libmpcodecs/vf_lavcdeint.c
View File

@ -10,12 +10,7 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#else
#include "libavcodec/avcodec.h"
#endif
extern int avcodec_initialized;

10
libmpcodecs/vf_pp.c
View File

@ -15,18 +15,12 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
#ifdef USE_LIBPOSTPROC_SO
#include <postproc/postprocess.h>
#elif defined(USE_LIBPOSTPROC)
#define EMU_OLD
#include "libpostproc/postprocess.h"
#ifdef EMU_OLD
#ifdef USE_LIBPOSTPROC_A
#define EMU_OLD
#include "libpostproc/postprocess_internal.h"
#endif
#endif
struct vf_priv_s {
int pp;

6
libmpcodecs/vf_sab.c
View File

@ -29,11 +29,7 @@
#include <malloc.h>
#endif
#ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/avutil.h>
#else
#include "avutil.h"
#endif
#include "libavutil/avutil.h"
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"

5
libmpcodecs/vf_screenshot.c
View File

@ -20,12 +20,7 @@
#include "vf_scale.h"
#include "libswscale/swscale.h"
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#else
#include "libavcodec/avcodec.h"
#endif
struct vf_priv_s {
int frameno;

6
libmpcodecs/vf_smartblur.c
View File

@ -29,11 +29,7 @@
#include <malloc.h>
#endif
#ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/avutil.h>
#else
#include "avutil.h"
#endif
#include "libavutil/avutil.h"
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"

4
libmpdemux/demux_asf.c
View File

@ -79,9 +79,7 @@ static void init_priv (struct asf_priv* asf){
asf->vid_ext_frame_index=-1;
}
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#elif defined(USE_LIBAVCODEC)
#ifdef USE_LIBAVCODEC
#include "libavcodec/avcodec.h"
#else
#define FF_INPUT_BUFFER_PADDING_SIZE 8

16
libmpdemux/demux_lavf.c
View File

@ -31,17 +31,11 @@
#include "m_option.h"
#include "libvo/sub.h"
#ifdef USE_LIBAVFORMAT_SO
#include <ffmpeg/avformat.h>
#include <ffmpeg/avutil.h>
#include <ffmpeg/opt.h>
#else
#include "avformat.h"
#include "avutil.h"
#include "avi.h"
#include "opt.h"
#endif
#include "riff.h"
#include "libavformat/avformat.h"
#include "libavutil/avutil.h"
#include "libavformat/avi.h"
#include "libavcodec/opt.h"
#include "libavformat/riff.h"
#define PROBE_BUF_SIZE 2048

5
libmpdemux/demux_mkv.c
View File

@ -39,13 +39,8 @@
#include <zlib.h>
#endif
#ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/lzo.h>
#include <ffmpeg/intreadwrite.h>
#else
#include "libavutil/lzo.h"
#include "libavutil/intreadwrite.h"
#endif
#include "libavutil/avstring.h"
static unsigned char sipr_swaps[38][2]={

4
libmpdemux/demux_real.c
View File

@ -33,9 +33,7 @@ Video codecs: (supported by RealPlayer8 for Linux)
#include "demuxer.h"
#include "stheader.h"
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#elif defined(USE_LIBAVCODEC)
#ifdef USE_LIBAVCODEC
#include "libavcodec/avcodec.h"
#else
#define FF_INPUT_BUFFER_PADDING_SIZE 8

4
libmpdemux/demux_rtp_internal.h
View File

@ -10,9 +10,7 @@ extern "C" {
#ifndef DEMUXER_H
#include "demuxer.h"
#endif
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#elif defined(USE_LIBAVCODEC)
#ifdef USE_LIBAVCODEC
#include "libavcodec/avcodec.h"
#endif
}

4
libmpdemux/demux_viv.c
View File

@ -14,9 +14,7 @@
#include "demuxer.h"
#include "stheader.h"
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#elif defined(USE_LIBAVCODEC)
#ifdef USE_LIBAVCODEC
#include "libavcodec/avcodec.h"
#else
#define FF_INPUT_BUFFER_PADDING_SIZE 8

6
libmpdemux/muxer_lavf.c
View File

@ -17,11 +17,7 @@
#include "demuxer.h"
#include "stheader.h"
#include "m_option.h"
#ifdef USE_LIBAVFORMAT_SO
#include <ffmpeg/avformat.h>
#else
#include "avformat.h"
#endif
#include "libavformat/avformat.h"
#include "libavutil/avstring.h"
enum PixelFormat imgfmt2pixfmt(int fmt);

4
libmpdemux/video.c
View File

@ -22,9 +22,7 @@
/* sub_cc (closed captions)*/
#include "sub_cc.h"
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#elif defined(USE_LIBAVCODEC)
#ifdef USE_LIBAVCODEC
#include "libavcodec/avcodec.h"
#else
#define FF_INPUT_BUFFER_PADDING_SIZE 8

4
libvo/vo_md5sum.c
View File

@ -41,11 +41,7 @@
#include "video_out_internal.h"
#include "mplayer.h" /* for exit_player() */
#include "help_mp.h"
#ifdef USE_LIBAVUTIL_SO
#include "ffmpeg/md5.h"
#else
#include "libavutil/md5.h"
#endif
/* ------------------------------------------------------------------------- */

6
mencoder.c
View File

@ -84,10 +84,8 @@
#include "stream/stream_dvdnav.h"
#endif
#ifdef USE_LIBAVCODEC_SO
#include <ffmpeg/avcodec.h>
#elif USE_LIBAVCODEC_A
#include "avcodec.h"
#ifdef USE_LIBAVCODEC
#include "libavcodec/avcodec.h"
#endif
#include "libmpcodecs/ae.h"

6
spudec.c
View File

@ -23,11 +23,7 @@
#include <math.h>
#include "libvo/video_out.h"
#include "spudec.h"
#ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/avutil.h>
#else
#include "avutil.h"
#endif
#include "libavutil/avutil.h"
#include "libswscale/swscale.h"
/* Valid values for spu_aamode:

4
stream/realrtsp/real.c
View File

@ -36,11 +36,7 @@
#include "asmrp.h"
#include "sdpplin.h"
#include "xbuffer.h"
#if USE_LIBAVUTIL_SO
#include "ffmpeg/md5.h"
#else
#include "libavutil/md5.h"
#endif
#include "libavutil/intreadwrite.h"
#include "../http.h"
#include "mp_msg.h"