From 1dd7b251792b8c80c67bacb9df8cb43c94d0b808 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 12 Feb 2013 11:47:44 +0000
Subject: ffmpeg plugin: cleanup

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3232 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp       |  5 -----
 src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 12 +++++++-----
 src/plugins/Input/ffmpeg/decoderffmpegfactory.h   |  1 +
 src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp  |  5 -----
 src/plugins/Input/ffmpeg/settingsdialog.cpp       |  2 --
 5 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'src/plugins/Input/ffmpeg')

diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 831f2d0c5..68ea14a5c 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -96,13 +96,8 @@ bool DecoderFFmpeg::initialize()
     m_totalTime = 0;
     m_seekTime = -1;
 
-    avcodec_register_all();
-    avformat_network_init();
-    av_register_all();
-
     ic = avformat_alloc_context();
 
-
     AVProbeData  pd;
     uint8_t buf[PROBE_BUFFER_SIZE + AVPROBE_PADDING_SIZE];
     pd.filename = m_path.toLocal8Bit().constData();
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 02588a92c..b8ffae9fe 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -35,6 +35,13 @@ extern "C"{
 
 // DecoderFFmpegFactory
 
+DecoderFFmpegFactory::DecoderFFmpegFactory()
+{
+    avcodec_register_all();
+    avformat_network_init();
+    av_register_all();
+}
+
 bool DecoderFFmpegFactory::supports(const QString &source) const
 {
     foreach(QString filter, properties().filters)
@@ -48,7 +55,6 @@ bool DecoderFFmpegFactory::supports(const QString &source) const
 
 bool DecoderFFmpegFactory::canDecode(QIODevice *i) const
 {
-    av_register_all();
     QStringList filters = properties().filters;
 
     AVProbeData  pd;
@@ -83,7 +89,6 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const
 
 const DecoderProperties DecoderFFmpegFactory::properties() const
 {
-    av_register_all();
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QStringList filters;
     filters << "*.wma" << "*.ape";
@@ -134,9 +139,6 @@ Decoder *DecoderFFmpegFactory::create(const QString &path, QIODevice *input)
 QList<FileInfo *> DecoderFFmpegFactory::createPlayList(const QString &fileName, bool useMetaData)
 {
     QList <FileInfo*> list;
-    avcodec_register_all();
-    avformat_network_init();
-    av_register_all();
     AVFormatContext *in = 0;
 
     if (avformat_open_input(&in,fileName.toLocal8Bit().constData(), 0, 0) < 0)
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
index a668c8608..3848b98df 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
@@ -37,6 +37,7 @@ Q_OBJECT
 Q_INTERFACES(DecoderFactory)
 
 public:
+    DecoderFFmpegFactory();
     bool supports(const QString &source) const;
     bool canDecode(QIODevice *input) const;
     const DecoderProperties properties() const;
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
index 994be83dc..5a49eca81 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
@@ -23,11 +23,6 @@
 FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent)
 {
     m_in = 0;
-    avcodec_register_all();
-    avformat_network_init();
-    av_register_all();
-
-
     if (avformat_open_input(&m_in, path.toLocal8Bit().constData(), 0, 0) < 0)
         return;
     avformat_find_stream_info(m_in, 0);
diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp
index ab9c22007..7ace899df 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.cpp
+++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp
@@ -39,8 +39,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     filters << "*.wma";
     filters << "*.ape";
     filters = settings.value("FFMPEG/filters", filters).toStringList();
-    avcodec_register_all();
-    av_register_all();
     ui.wmaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_WMAV1));
     ui.wmaCheckBox->setChecked(filters.contains("*.wma") && avcodec_find_decoder(CODEC_ID_WMAV1));
     ui.apeCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_APE));
-- 
cgit v1.2.3-13-gbd6f