diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-09 20:40:24 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-09 20:40:24 +0200 |
| commit | 1836b8ffe31f393d256c8021aaf7a2308561a0c2 (patch) | |
| tree | 6a80efd3b4ed8a29d55a7b331a43ac7bd5ed4855 /src/libffmpeg/ffmpeg_decoder.h | |
| parent | a89f36b0b3e9008cd7f8378e4fa40a3c37d7a23e (diff) | |
| parent | 199dc87abe65001f7ef9ec56bca7c3d80af39bcf (diff) | |
| download | xine-lib-1836b8ffe31f393d256c8021aaf7a2308561a0c2.tar.gz xine-lib-1836b8ffe31f393d256c8021aaf7a2308561a0c2.tar.bz2 | |
Merge the FFmpeg integration branch into the nopadding branch.
Diffstat (limited to 'src/libffmpeg/ffmpeg_decoder.h')
| -rw-r--r-- | src/libffmpeg/ffmpeg_decoder.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/libffmpeg/ffmpeg_decoder.h index 879ee3175..f005f09e5 100644 --- a/src/libffmpeg/ffmpeg_decoder.h +++ b/src/libffmpeg/ffmpeg_decoder.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.h,v 1.7 2006/08/02 07:15:27 tmmm Exp $ + * $Id: xine_decoder.h,v 1.7.2.1 2006/12/02 01:20:07 dgp85 Exp $ * */ @@ -28,11 +28,7 @@ #include "config.h" #endif -#ifdef HAVE_FFMPEG -# include <avcodec.h> -#else -# include "libavcodec/avcodec.h" -#endif +#include <avcodec.h> typedef struct ff_codec_s { uint32_t type; |