diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 11:09:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 11:09:38 +0100 |
| commit | 799d749c77de28a6790db48b3465ecdc56822d96 (patch) | |
| tree | 79e62292d12bb4615ba643f2d351d9e6657099e0 /libavformat/mmf.c | |
| parent | 7eb40d85f2258df31287dc7a0704cb35e356c077 (diff) | |
| parent | b9629acb6b647b31b8b4e3932e836189bd03e5b9 (diff) | |
| download | ffmpeg-799d749c77de28a6790db48b3465ecdc56822d96.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
yop: set channel layout
wtv: set channel layout for mpeg audio
westwood_aud: set channel layout
wc3movie: set channel layout
tmv: set channel layout
tiertexseq: set channel layout
swfdec: set channel layout
sol: set channel layout
smacker: set channel layout
siff: set channel layout
sierravmd: set channel layout
rtpdec_amr: set channel layout
rsodec: set channel layout
rmdec: set channel layout for RA version 3
qcp: set channel layout
psxstr: set channel layout
omadec: set channel layout
oggparsespeex: validate channel count and set channel layout
nuv: set channel layout
mxg: set channel layout
...
Conflicts:
libavformat/swfdec.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mmf.c')
| -rw-r--r-- | libavformat/mmf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 18b69d471f..e77137f290 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -18,6 +18,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" #include "avio_internal.h" @@ -249,6 +251,7 @@ static int mmf_read_header(AVFormatContext *s) st->codec->codec_id = AV_CODEC_ID_ADPCM_YAMAHA; st->codec->sample_rate = rate; st->codec->channels = 1; + st->codec->channel_layout = AV_CH_LAYOUT_MONO; st->codec->bits_per_coded_sample = 4; st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample; |