diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-08-16 15:31:23 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-08-16 15:31:23 +0000 |
| commit | 6bbed3ff2fb8043f407a76bc4112ac0fa1e0d28a (patch) | |
| tree | bd8c5c272d985cdce7d7df62462c81ebc680189a /src/libffmpeg/video_decoder.c | |
| parent | 1398bff6898de4781bb6f19ca326928ccdc0fa0f (diff) | |
| download | xine-lib-6bbed3ff2fb8043f407a76bc4112ac0fa1e0d28a.tar.gz xine-lib-6bbed3ff2fb8043f407a76bc4112ac0fa1e0d28a.tar.bz2 | |
header inclusion has to depend on the configure detection, because when
always using <avcodec.h>, someone who has external ffmpeg installed, but
wants to use xine's internal one will include the wrong headers
CVS patchset: 6888
CVS date: 2004/08/16 15:31:23
Diffstat (limited to 'src/libffmpeg/video_decoder.c')
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index 8cff6acff..35f88b1e1 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.c @@ -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: video_decoder.c,v 1.25 2004/07/31 18:57:45 valtri Exp $ + * $Id: video_decoder.c,v 1.26 2004/08/16 15:31:23 mroi Exp $ * * xine video decoder plugin using ffmpeg * @@ -47,7 +47,11 @@ #include "xine_decoder.h" #include "mpeg_parser.h" -#include <postprocess.h> +#ifdef HAVE_FFMPEG +# include <postprocess.h> +#else +# include "libavcodec/libpostproc/postprocess.h" +#endif #define VIDEOBUFSIZE (128*1024) #define SLICE_BUFFER_SIZE (1194*1024) |