Browse Source

lavf/riffenc: Always write unexpected channel_mask.

Allows to write arbitrary channel masks also for 16bit 48kHz pcm.
tags/n3.2
Carl Eugen Hoyos 9 years ago
parent
commit
fe8959bbec
2 changed files with 3 additions and 1 deletions
  1. +2
    -0
      libavformat/riffenc.c
  2. +1
    -1
      libavformat/version.h

+ 2
- 0
libavformat/riffenc.c View File

@@ -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;


+ 1
- 1
libavformat/version.h View File

@@ -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, \


Loading…
Cancel
Save