oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ffmpeg: move code to lib/ffmpeg/Init.cxx

Browse Source
This commit is contained in:
Max Kellermann 2014-12-21 20:51:41 +01:00
parent 5fee130d00
commit 543296b5ba
4 changed files with 67 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -799,6 +799,7 @@ endif
if HAVE_FFMPEG if HAVE_FFMPEG
noinst_LIBRARIES += libffmpeg.a noinst_LIBRARIES += libffmpeg.a
libffmpeg_a_SOURCES = \ libffmpeg_a_SOURCES = \
src/lib/ffmpeg/Init.cxx src/lib/ffmpeg/Init.hxx \
src/lib/ffmpeg/Time.hxx \ src/lib/ffmpeg/Time.hxx \
src/lib/ffmpeg/Buffer.hxx \ src/lib/ffmpeg/Buffer.hxx \
src/lib/ffmpeg/LogError.cxx src/lib/ffmpeg/LogError.hxx \ src/lib/ffmpeg/LogError.cxx src/lib/ffmpeg/LogError.hxx \

6
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -26,7 +26,7 @@
#include "lib/ffmpeg/Domain.hxx" #include "lib/ffmpeg/Domain.hxx"
#include "lib/ffmpeg/Error.hxx" #include "lib/ffmpeg/Error.hxx"
#include "lib/ffmpeg/LogError.hxx" #include "lib/ffmpeg/LogError.hxx"
#include "lib/ffmpeg/LogCallback.hxx" #include "lib/ffmpeg/Init.hxx"
#include "lib/ffmpeg/Buffer.hxx" #include "lib/ffmpeg/Buffer.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "FfmpegMetaData.hxx" #include "FfmpegMetaData.hxx"
@ -76,9 +76,7 @@ mpd_ffmpeg_open_input(AVFormatContext **ic_ptr,
static bool static bool
ffmpeg_init(gcc_unused const config_param &param) ffmpeg_init(gcc_unused const config_param &param)
{ {
av_log_set_callback(FfmpegLogCallback); FfmpegInit();
av_register_all();
return true; return true;
} }

38
src/lib/ffmpeg/Init.cxx Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/* necessary because libavutil/common.h uses UINT64_C */
#define __STDC_CONSTANT_MACROS
#include "config.h"
#include "Init.hxx"
#include "LogCallback.hxx"
extern "C" {
#include <libavformat/avformat.h>
}
void
FfmpegInit()
{
av_log_set_callback(FfmpegLogCallback);
av_register_all();
}

26
src/lib/ffmpeg/Init.hxx Normal file
View File

@ -0,0 +1,26 @@
/*
* Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_FFMPEG_INIT_HXX
#define MPD_FFMPEG_INIT_HXX
void
FfmpegInit();
#endif