diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-04-23 15:30:50 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2015-02-20 09:18:29 +0100 |
commit | 0bbe5ac82ef2845efafbf190044f16712db113b2 (patch) | |
tree | ac8745fba01c8a3e902e886f46f90ad56576559f /src/output/roar_output_plugin.c | |
parent | c69c8ffa9ec55c94dee7ce69af26b4edbd61647e (diff) |
Switch to Libav sample formats everywhere.
Drop 24bit format for now. It should be restored later by properly
distinguishing between internal and packed formats.
Diffstat (limited to 'src/output/roar_output_plugin.c')
-rw-r--r-- | src/output/roar_output_plugin.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/output/roar_output_plugin.c b/src/output/roar_output_plugin.c index 1c2c4832..90dc2ac0 100644 --- a/src/output/roar_output_plugin.c +++ b/src/output/roar_output_plugin.c @@ -154,27 +154,20 @@ roar_use_audio_format(struct roar_audio_info *info, info->codec = ROAR_CODEC_PCM_S; switch (audio_format->format) { - case SAMPLE_FORMAT_UNDEFINED: - info->bits = 16; - audio_format->format = SAMPLE_FORMAT_S16; - break; - - case SAMPLE_FORMAT_S8: + case AV_SAMPLE_FMT_U8: info->bits = 8; break; - - case SAMPLE_FORMAT_S16: + case AV_SAMPLE_FMT_S16: info->bits = 16; break; - - case SAMPLE_FORMAT_S24_P32: + case AV_SAMPLE_FMT_S32: info->bits = 32; - audio_format->format = SAMPLE_FORMAT_S32; break; - - case SAMPLE_FORMAT_S32: - info->bits = 32; + default: + info->bits = 16; + audio_format->format = AV_SAMPLE_FMT_S16; break; + } } |