Mercurial > mplayer.hg

diff libmpcodecs/ad_ffmpeg.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 45966266392b
children 9986a61354e6
line wrap: on
line diff
--- a/libmpcodecs/ad_ffmpeg.c	Sat Sep 04 00:20:08 2010 +0000
+++ b/libmpcodecs/ad_ffmpeg.c	Sat Sep 04 08:11:31 2010 +0000
@@ -25,6 +25,7 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
+#include "vd_ffmpeg.h"
 #include "libaf/reorder_ch.h"
 
 #include "mpbswap.h"
@@ -44,7 +45,6 @@
 
 #include "libavcodec/avcodec.h"
 
-extern int avcodec_initialized;
 
 static int preinit(sh_audio_t *sh)
 {
@@ -95,11 +95,7 @@
     AVCodec *lavc_codec;
 
     mp_msg(MSGT_DECAUDIO,MSGL_V,"FFmpeg's libavcodec audio codec\n");
-    if(!avcodec_initialized){
-      avcodec_init();
-      avcodec_register_all();
-      avcodec_initialized=1;
-    }
+    init_avcodec();
 
     lavc_codec = avcodec_find_decoder_by_name(sh_audio->codec->dll);
     if(!lavc_codec){