diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2013-11-04 12:03:27 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2013-11-04 12:03:27 +0200 |
| commit | af7e981ca4e63e081970b74e00f70051ab2c6122 (patch) | |
| tree | ea34a2020bb3e86280deb2960228ad069665ad17 /src/combined/ffmpeg/ffmpeg_decoder.c | |
| parent | 46987961ea296220d70e30223f3895f06207c3bf (diff) | |
| download | xine-lib-af7e981ca4e63e081970b74e00f70051ab2c6122.tar.gz xine-lib-af7e981ca4e63e081970b74e00f70051ab2c6122.tar.bz2 | |
Add avio (libavformat) input plugin.
Diffstat (limited to 'src/combined/ffmpeg/ffmpeg_decoder.c')
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c index e5480cc39..4915b538e 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.c +++ b/src/combined/ffmpeg/ffmpeg_decoder.c @@ -29,6 +29,10 @@ #include "ffmpeg_decoder.h" #include "ffmpeg_compat.h" +#ifdef HAVE_AVFORMAT +#include <libavformat/avformat.h> // av_register_all() +#endif + /* * common initialisation */ @@ -40,6 +44,11 @@ void init_once_routine(void) { pthread_mutex_init(&ffmpeg_lock, NULL); avcodec_init(); avcodec_register_all(); + +#ifdef HAVE_AVFORMAT + av_register_all(); + avformat_network_init(); +#endif } /* @@ -52,5 +61,8 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { { PLUGIN_VIDEO_DECODER, 19, "ffmpeg-wmv8", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv8, init_video_plugin }, { PLUGIN_VIDEO_DECODER, 19, "ffmpeg-wmv9", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv9, init_video_plugin }, { PLUGIN_AUDIO_DECODER, 16, "ffmpegaudio", XINE_VERSION_CODE, &dec_info_ffmpeg_audio, init_audio_plugin }, +#ifdef HAVE_AVFORMAT + { PLUGIN_INPUT, 18, INPUT_AVIO_ID, XINE_VERSION_CODE, &input_info_avio, init_avio_input_plugin }, +#endif { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; |