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/xine_encoder.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/xine_encoder.c')
| -rw-r--r-- | src/libffmpeg/xine_encoder.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c index 07bf9b8fa..e6d4da926 100644 --- a/src/libffmpeg/xine_encoder.c +++ b/src/libffmpeg/xine_encoder.c @@ -17,11 +17,15 @@ * 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_encoder.c,v 1.17 2004/07/31 18:57:45 valtri Exp $ + * $Id: xine_encoder.c,v 1.18 2004/08/16 15:31:23 mroi Exp $ */ /* mpeg encoders for the dxr3 video out plugin. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdio.h> #include <stdlib.h> #include <sys/ioctl.h> @@ -34,7 +38,12 @@ /* #define LOG */ #include "video_out_dxr3.h" -#include <avcodec.h> + +#ifdef HAVE_FFMPEG +# include <avcodec.h> +#else +# include "libavcodec/avcodec.h" +#endif /* buffer size for encoded mpeg1 stream; will hold one intra frame * at 640x480 typical sizes are <50 kB. 512 kB should be plenty */ |