starred/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-24 07:31:22 +01:00
Code Issues 5 Projects Packages Wiki Activity Actions

Merge commit 'ac85f631c9'

Browse source 
* commit 'ac85f631c9':
  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
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 <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: