virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'

Browse Source 
* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594':
  output example: set output channel layout

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-06-26 22:13:46 +02:00
parent 8eb1174a9e ac85f631c9
commit a1c4635558
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/examples/muxing.c
View File

@@ -34,6 +34,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <libavutil/channel_layout.h>
#include <libavutil/opt.h> #include <libavutil/opt.h>
#include <libavutil/mathematics.h> #include <libavutil/mathematics.h>
#include <libavutil/timestamp.h> #include <libavutil/timestamp.h>
@@ -109,6 +110,7 @@ static AVStream *add_stream(OutputStream *ost, AVFormatContext *oc,
c->bit_rate = 64000; c->bit_rate = 64000;
c->sample_rate = 44100; c->sample_rate = 44100;
c->channels = 2; c->channels = 2;
c->channel_layout = AV_CH_LAYOUT_STEREO;
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO: