* get screen size with gtk2

[vlc] / modules / stream_out / transcode.c

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index a1dcb92ab80c88143ede93cd49119ba2f7626298..8b22c2a79163f2a78540ead6f5f92efe86ff1a04 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2,7 +2,7 @@
  * transcode.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: transcode.c,v 1.2 2003/04/14 03:13:30 fenrir Exp $
+ * $Id: transcode.c,v 1.4 2003/04/20 11:57:13 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -31,7 +31,12 @@
 #include <vlc/input.h>
 #include <vlc/sout.h>
 
-#include <avcodec.h>
+/* ffmpeg header */
+#ifdef HAVE_FFMPEG_AVCODEC_H
+#   include <ffmpeg/avcodec.h>
+#else
+#   include <avcodec.h>
+#endif
 
 /*****************************************************************************
  * Exported prototypes
@@ -700,8 +705,12 @@ static int transcode_video_ffmpeg_new   ( sout_stream_t *p_stream, sout_stream_i
     id->ff_enc_c->width          = id->f_dst.i_width;
     id->ff_enc_c->height         = id->f_dst.i_height;
     id->ff_enc_c->bit_rate       = id->f_dst.i_bitrate;
+#if LIBAVCODEC_BUILD >= 4662
     id->ff_enc_c->frame_rate     = 25 ; // FIXME as it break mpeg
     id->ff_enc_c->frame_rate_base= 1;
+#else
+    id->ff_enc_c->frame_rate     = 25 * FRAME_RATE_BASE;
+#endif
     id->ff_enc_c->gop_size       = 25;
     id->ff_enc_c->qmin           = 2;
     id->ff_enc_c->qmax           = 31;