diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 22:13:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 22:13:46 +0200 |
| commit | a1c4635558cbb0a311022a0c74258118d09d260e (patch) | |
| tree | 877943edca43038403d71175df8ea47cf68f424b /doc | |
| parent | 8eb1174a9ed35ba2735ec6874b0da87052185c9d (diff) | |
| parent | ac85f631c9a9cc59aaca1c8dd6894fb1f701c594 (diff) | |
| download | ffmpeg-a1c4635558cbb0a311022a0c74258118d09d260e.tar.gz | |
Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'
* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594':
output example: set output channel layout
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/muxing.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index fe4c12aee4..e26c25da16 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -34,6 +34,7 @@ #include <string.h> #include <math.h> +#include <libavutil/channel_layout.h> #include <libavutil/opt.h> #include <libavutil/mathematics.h> #include <libavutil/timestamp.h> @@ -109,6 +110,7 @@ static AVStream *add_stream(OutputStream *ost, AVFormatContext *oc, c->bit_rate = 64000; c->sample_rate = 44100; c->channels = 2; + c->channel_layout = AV_CH_LAYOUT_STEREO; break; case AVMEDIA_TYPE_VIDEO: |