aboutsummaryrefslogtreecommitdiffhomepage
path: root/libvo
diff options
context:
space:
mode:
authorGravatar mswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-30 06:24:49 +0000
committerGravatar mswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-30 06:24:49 +0000
commit9adb559bb1b4dc2ccec5c8f17276ac77f064b92c (patch)
treeb0cf396e49df40c950b579b356549f9561acef11 /libvo
parentc484393153d2f6a859b9d94721efe4acf249ccd2 (diff)
Fixed avcodec init bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5398 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_dxr3.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index 69f39eaf6a..1f014d2183 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -83,9 +83,9 @@
#include "video_out.h"
#include "video_out_internal.h"
#include "aspect.h"
-#include "../postproc/rgb2rgb.h"
-#include "../postproc/swscale.h"
-#include "../cpudetect.h"
+#include "postproc/rgb2rgb.h"
+#include "postproc/swscale.h"
+#include "cpudetect.h"
#define USE_LIBFAME
@@ -103,14 +103,17 @@ static fame_object_t *fame_obj;
#ifdef USE_LIBAVCODEC
#ifdef USE_LIBAVCODEC_SO
#include <libffmpeg/avcodec.h>
+#include <libffmpeg/dsputil.h>
#else
#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
#endif
/* for video encoder */
static AVCodec *avc_codec = NULL;
static AVCodecContext *avc_context = NULL;
static AVPicture avc_picture;
int avc_outbuf_size = 100000;
+extern int avcodec_inited;
#endif
char *picture_data[] = { NULL, NULL, NULL };
@@ -679,10 +682,12 @@ static uint32_t preinit(const char *arg)
}
#if defined(USE_LIBAVCODEC)
- if (mpeg_codec == MPG_CODEC_AVCODEC && !avc_context) {
+ if (mpeg_codec == MPG_CODEC_AVCODEC && !avcodec_inited) {
avcodec_init();
- avcodec_register_all();
+ avcodec_register_all();
+ avcodec_inited = 1;
}
+
#endif
return 0;