diff options
| author | Max Kellermann <max@duempel.org> | 2012-01-12 18:59:21 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-01-12 18:59:21 +0100 |
| commit | ec43721c3cd5d45ec905141ec0c02e7feacd9d80 (patch) | |
| tree | c4e9d05c1a806a7fd4c9487197dae427a855c45f /src/decoder | |
| parent | 26ec62714c06f061269d42a742bff2713e789068 (diff) | |
| parent | 39d52762d15fadb892d2d9163bc6b763e99b70f8 (diff) | |
| download | mpd-ec43721c3cd5d45ec905141ec0c02e7feacd9d80.tar.gz mpd-ec43721c3cd5d45ec905141ec0c02e7feacd9d80.tar.xz mpd-ec43721c3cd5d45ec905141ec0c02e7feacd9d80.zip | |
Merge branch 'v0.16.x'
Conflicts:
src/decoder/ffmpeg_decoder_plugin.c
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/ffmpeg_decoder_plugin.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 05a59c1e0..96a88a588 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -35,8 +35,12 @@ #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> #include <libavformat/avio.h> +#include <libavutil/avutil.h> #include <libavutil/log.h> #include <libavutil/mathematics.h> +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0) +#include <libavutil/dict.h> +#endif #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "ffmpeg" @@ -428,7 +432,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input) 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 = avformat_find_stream_info(format_context, NULL); #else @@ -601,7 +605,7 @@ ffmpeg_copy_metadata(struct tag *tag, #endif 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; 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; } -#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,2,0) +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,6,0) const int find_result = avformat_find_stream_info(f, NULL); #else |