diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 10:55:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 10:55:07 +0100 |
| commit | 7eb40d85f2258df31287dc7a0704cb35e356c077 (patch) | |
| tree | fc2054037b541d507aa2af4009dd85ad41eeaaf3 /libavformat/amr.c | |
| parent | a8f2420e06d515d71724d83b3f73f31328e8ebd5 (diff) | |
| parent | ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b (diff) | |
| download | ffmpeg-7eb40d85f2258df31287dc7a0704cb35e356c077.tar.gz | |
Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'
* commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits)
jvdec: set channel layout
iss: set channel layout
ipmovie: set channel layout
iff: set channel layout
idroqdec: set channel layout
gxfdec: set channel layout when applicable
gsmdec: set channel layout
flvdec: set channel layout
dv: set channel layout
dsicin: set channel layout
daud: set channel layout
cdxl: set channel layout
bmv: set channel layout
bink: set channel layout
bfi: set channel layout
bethsoftvid: set channel layout
apc: set channel layout
amr: set channel_layout
ppc: replace pointer casting with AV_COPY32
ppc: fix some unused variable warnings
...
Conflicts:
libavformat/amr.c
libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/amr.c')
| -rw-r--r-- | libavformat/amr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c index 36ff9b036a..07ab1bac82 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -25,7 +25,9 @@ Write and read amr data according to RFC3267, http://www.ietf.org/rfc/rfc3267.tx Only mono files are supported. */ + #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" @@ -98,6 +100,7 @@ static int amr_read_header(AVFormatContext *s) st->codec->sample_rate = 8000; } st->codec->channels = 1; + st->codec->channel_layout = AV_CH_LAYOUT_MONO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); |