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

Merge branch 'v0.18.x'

This commit is contained in:
Max Kellermann 2014-08-16 08:25:10 +02:00
parent 2722211ba3 40280fa6cf
commit a9f6556454
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -58,6 +58,8 @@ ver 0.19 (not yet released)
* Android port * Android port
ver 0.18.13 (not yet released) ver 0.18.13 (not yet released)
* decoder
- ffmpeg: support ffmpeg/libav version 11
ver 0.18.12 (2014/07/30) ver 0.18.12 (2014/07/30)
* database * database

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

@ -452,9 +452,18 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
AVStream *av_stream = format_context->streams[audio_stream]; AVStream *av_stream = format_context->streams[audio_stream];
AVCodecContext *codec_context = av_stream->codec; AVCodecContext *codec_context = av_stream->codec;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0)
const AVCodecDescriptor *codec_descriptor =
avcodec_descriptor_get(codec_context->codec_id);
if (codec_descriptor != nullptr)
FormatDebug(ffmpeg_domain, "codec '%s'",
codec_descriptor->name);
#else
if (codec_context->codec_name[0] != 0) if (codec_context->codec_name[0] != 0)
FormatDebug(ffmpeg_domain, "codec '%s'", FormatDebug(ffmpeg_domain, "codec '%s'",
codec_context->codec_name); codec_context->codec_name);
#endif
AVCodec *codec = avcodec_find_decoder(codec_context->codec_id); AVCodec *codec = avcodec_find_decoder(codec_context->codec_id);

2
src/util/ASCII.hxx
View File

@ -33,7 +33,7 @@
#include "Compiler.h" #include "Compiler.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <strings.h>
/** /**
* Determine whether two strings are equal, ignoring case for ASCII * Determine whether two strings are equal, ignoring case for ASCII