RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed avcodec init bug 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5398 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
mswitch 2002-03-30 06:24:49 +00:00
parent c484393153
commit 9adb559bb1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libvo/vo_dxr3.c
View File

@ -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;