Mercurial > mplayer.hg
changeset 5397:23b4c6b1b129
Fixed avcodec init bug
| author | mswitch |
|---|---|
| date | Sat, 30 Mar 2002 06:24:49 +0000 |
| parents | 28aacc467e13 |
| children | a4a93ca8b276 |
| files | libvo/vo_dxr3.c |
| diffstat | 1 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_dxr3.c Fri Mar 29 22:37:14 2002 +0000 +++ b/libvo/vo_dxr3.c Sat Mar 30 06:24:49 2002 +0000 @@ -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 @@ #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 @@ } #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;