Merge branch 'v0.19.x'

This commit is contained in:
Max Kellermann
2014-12-26 14:40:32 +01:00
30 changed files with 147 additions and 52 deletions

View File

@@ -232,6 +232,7 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt)
case AV_SAMPLE_FMT_S32P:
return SampleFormat::S32;
case AV_SAMPLE_FMT_FLT:
case AV_SAMPLE_FMT_FLTP:
return SampleFormat::FLOAT;