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_encoder.c | |
| 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_encoder.c')
| -rw-r--r-- | src/libffmpeg/ffmpeg_encoder.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libffmpeg/ffmpeg_encoder.c b/src/libffmpeg/ffmpeg_encoder.c index e234b4ddc..8db721002 100644 --- a/src/libffmpeg/ffmpeg_encoder.c +++ b/src/libffmpeg/ffmpeg_encoder.c @@ -40,11 +40,7 @@ #include "video_out_dxr3.h" -#ifdef HAVE_FFMPEG -# include <avcodec.h> -#else -# include "libavcodec/avcodec.h" -#endif +#include <avcodec.h> /* buffer size for encoded mpeg1 stream; will hold one intra frame * at 640x480 typical sizes are <50 kB. 512 kB should be plenty */ |