Mercurial > mplayer.hg

diff libmpcodecs/vf_lavc.c @ 31959:f957f330aa6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduce init_avcodec function to avoid duplicated FFmpeg initializations. Vlad Seryakov, vseryakov gmail com
author diego
date Sat, 04 Sep 2010 08:11:31 +0000
parents a972c1a4a012
children 8fa2f43cb760
line wrap: on
line diff
--- a/libmpcodecs/vf_lavc.c	Sat Sep 04 00:20:08 2010 +0000
+++ b/libmpcodecs/vf_lavc.c	Sat Sep 04 08:11:31 2010 +0000
@@ -28,9 +28,9 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
+#include "vd_ffmpeg.h"
 #include "libavcodec/avcodec.h"
 
-extern int avcodec_initialized;
 
 struct vf_priv_s {
     unsigned char* outbuf;
@@ -140,11 +140,7 @@
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv,0,sizeof(struct vf_priv_s));
 
-    if (!avcodec_initialized){
-	avcodec_init();
-	avcodec_register_all();
-	avcodec_initialized=1;
-    }
+    init_avcodec();
 
     vf->priv->codec = (AVCodec *)avcodec_find_encoder_by_name("mpeg1video");
     if (!vf->priv->codec) {