Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
dc4db714
Commit
dc4db714
authored
Aug 16, 2012
by
Jean-Baptiste Kempf
Browse files
Avcodec: use the standard includes
parent
77ed9b1d
Changes
10
Hide whitespace changes
Inline
Side-by-side
modules/codec/avcodec/audio.c
View file @
dc4db714
...
...
@@ -35,11 +35,7 @@
#include <vlc_avcodec.h>
/* ffmpeg header */
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#else
# include <avcodec.h>
#endif
#include <libavcodec/avcodec.h>
#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0)
# include "libavutil/audioconvert.h"
...
...
modules/codec/avcodec/avcodec.c
View file @
dc4db714
...
...
@@ -37,11 +37,7 @@
/* ffmpeg header */
#define HAVE_MMX 1
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#else
# include <avcodec.h>
#endif
#include <libavcodec/avcodec.h>
#include "avcodec.h"
#include "chroma.h"
...
...
modules/codec/avcodec/cpu.c
View file @
dc4db714
...
...
@@ -26,11 +26,7 @@
#include <vlc_cpu.h>
#define HAVE_MMX 1
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#else
# include <avcodec.h>
#endif
#include <libavcodec/avcodec.h>
#include "avcodec.h"
/**
...
...
modules/codec/avcodec/deinterlace.c
View file @
dc4db714
...
...
@@ -34,11 +34,7 @@
#include <vlc_filter.h>
/* ffmpeg header */
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#else
# include <avcodec.h>
#endif
#include <libavcodec/avcodec.h>
#include "avcodec.h"
#include "avcommon.h"
...
...
modules/codec/avcodec/dxva2.c
View file @
dc4db714
...
...
@@ -42,15 +42,11 @@
#include <vlc_cpu.h>
#include <assert.h>
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
# ifdef HAVE_AVCODEC_DXVA2
# define DXVA2API_USE_BITFIELDS
# define COBJMACROS
# include <libavcodec/dxva2.h>
# endif
#else
# include <avcodec.h>
#include <libavcodec/avcodec.h>
#ifdef HAVE_AVCODEC_DXVA2
# define DXVA2API_USE_BITFIELDS
# define COBJMACROS
# include <libavcodec/dxva2.h>
#endif
#include "avcodec.h"
...
...
modules/codec/avcodec/encoder.c
View file @
dc4db714
...
...
@@ -42,11 +42,7 @@
/* ffmpeg header */
#define HAVE_MMX 1
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#else
# include <avcodec.h>
#endif
#include <libavcodec/avcodec.h>
#include "avcodec.h"
#include "avcommon.h"
...
...
modules/codec/avcodec/fourcc.c
View file @
dc4db714
...
...
@@ -29,11 +29,7 @@
#include <vlc_common.h>
#include <vlc_codec.h>
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#else
# include <avcodec.h>
#endif
#include <libavcodec/avcodec.h>
#include "avcodec.h"
/*****************************************************************************
...
...
modules/codec/avcodec/subtitle.c
View file @
dc4db714
...
...
@@ -34,13 +34,9 @@
#include <vlc_avcodec.h>
/* ffmpeg header */
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
# ifdef HAVE_AVCODEC_VAAPI
# include <libavcodec/vaapi.h>
# endif
#else
# include <avcodec.h>
#include <libavcodec/avcodec.h>
#ifdef HAVE_AVCODEC_VAAPI
# include <libavcodec/vaapi.h>
#endif
#include "avcodec.h"
...
...
modules/codec/avcodec/vaapi.c
View file @
dc4db714
...
...
@@ -29,11 +29,7 @@
#include <vlc_fourcc.h>
#include <assert.h>
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#else
# include <avcodec.h>
#endif
#include <libavcodec/avcodec.h>
#include "avcodec.h"
#include "va.h"
...
...
modules/codec/avcodec/video.c
View file @
dc4db714
...
...
@@ -44,21 +44,15 @@
#include <assert.h>
/* ffmpeg header */
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
# ifdef HAVE_AVCODEC_VAAPI
# include <libavcodec/vaapi.h>
# endif
# ifdef HAVE_AVCODEC_DXVA2
# include <libavcodec/dxva2.h>
# endif
# ifdef HAVE_AVCODEC_VDA
# include <libavcodec/vda.h>
# endif
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#include <libavcodec/avcodec.h>
#ifdef HAVE_AVCODEC_VAAPI
# include <libavcodec/vaapi.h>
#endif
#ifdef HAVE_AVCODEC_DXVA2
# include <libavcodec/dxva2.h>
#endif
#ifdef HAVE_AVCODEC_VDA
# include <libavcodec/vda.h>
#endif
#include "avcodec.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment