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

Merge branch 'v0.16.x'

Browse Source 
Conflicts:
	src/decoder/ffmpeg_decoder_plugin.c
This commit is contained in:
Max Kellermann
2012-01-12 18:59:21 +01:00
parent 26ec62714c 39d52762d1
commit ec43721c3c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/decoder/ffmpeg_decoder_plugin.c
View File

@@ -35,8 +35,12 @@
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libavformat/avio.h> #include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/log.h> #include <libavutil/log.h>
#include <libavutil/mathematics.h> #include <libavutil/mathematics.h>
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0)
#include <libavutil/dict.h>
#endif
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "ffmpeg" #define G_LOG_DOMAIN "ffmpeg"
@@ -428,7 +432,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
return; return;
} }
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,2,0) #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,6,0)
const int find_result = const int find_result =
avformat_find_stream_info(format_context, NULL); avformat_find_stream_info(format_context, NULL);
#else #else
@@ -601,7 +605,7 @@ ffmpeg_copy_metadata(struct tag *tag,
#endif #endif
const ffmpeg_tag_map tag_map) const ffmpeg_tag_map tag_map)
{ {
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,1,0) #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0)
AVDictionaryEntry *mt = NULL; AVDictionaryEntry *mt = NULL;
while ((mt = av_dict_get(m, tag_map.name, mt, 0)) != NULL) while ((mt = av_dict_get(m, tag_map.name, mt, 0)) != NULL)
@@ -635,7 +639,7 @@ ffmpeg_stream_tag(struct input_stream *is)
return NULL; return NULL;
} }
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,2,0) #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,6,0)
const int find_result = const int find_result =
avformat_find_stream_info(f, NULL); avformat_find_stream_info(f, NULL);
#else #else