Merge branch 'v0.17.x'

2013-01-16 20:05:26 +01:00
parent b7cf279d6d 1105e61f29
commit 74500eacca
6 changed files with 51 additions and 4 deletions
--- 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;
 	}