diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-16 20:05:26 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-16 20:05:26 +0100 |
| commit | 74500eaccac3fd906489a93e969b67440ae41f5c (patch) | |
| tree | 05bad33463d15b534c9120ff9dc70381aed15558 /src/decoder | |
| parent | b7cf279d6da121d0bb0b274ab9581b697717b5a7 (diff) | |
| parent | 1105e61f292fd61a6316a4b83439dbaa29c102fd (diff) | |
| download | mpd-74500eaccac3fd906489a93e969b67440ae41f5c.tar.gz mpd-74500eaccac3fd906489a93e969b67440ae41f5c.tar.xz mpd-74500eaccac3fd906489a93e969b67440ae41f5c.zip | |
Merge branch 'v0.17.x'
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/ffmpeg_decoder_plugin.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 72a5ff341..4c4cb2b81 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -395,6 +395,11 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt) #endif return SAMPLE_FORMAT_S32; +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0) + case AV_SAMPLE_FMT_FLTP: + return SAMPLE_FORMAT_FLOAT; +#endif + default: break; } |