From fe8959bbece4d86a1872b813c25c2682dcd5ef42 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 12 Oct 2016 12:34:48 +0200 Subject: [PATCH] lavf/riffenc: Always write unexpected channel_mask. Allows to write arbitrary channel masks also for 16bit 48kHz pcm. --- libavformat/riffenc.c | 2 ++ libavformat/version.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index 4b25c061d9..c96329da48 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -71,6 +71,8 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, frame_size = av_get_audio_frame_duration2(par, par->block_align); waveformatextensible = (par->channels > 2 && par->channel_layout) || + par->channels == 1 && par->channel_layout && par->channel_layout != AV_CH_LAYOUT_MONO || + par->channels == 2 && par->channel_layout && par->channel_layout != AV_CH_LAYOUT_STEREO || par->sample_rate > 48000 || par->codec_id == AV_CODEC_ID_EAC3 || av_get_bits_per_sample(par->codec_id) > 16; diff --git a/libavformat/version.h b/libavformat/version.h index b70e9c3955..b642c8b5d6 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MINOR 51 -#define LIBAVFORMAT_VERSION_MICRO 106 +#define LIBAVFORMAT_VERSION_MICRO 107 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \