Commit dc4db714 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Avcodec: use the standard includes

parent 77ed9b1d
......@@ -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"
......
......@@ -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"
......
......@@ -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"
/**
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
/*****************************************************************************
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
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