diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 13:28:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 13:28:24 +0200 |
| commit | eeb6efcd58bc4a4022bf4b3e807d02ce66cad839 (patch) | |
| tree | cdbdd4374c26349da0b047324419172f7453bd6e /doc/examples/muxing.c | |
| parent | 32a7b858c9175b851503dc3fa66440efe2afd3ee (diff) | |
| parent | 08dd2c9df1c121844af5d6a8915aef9c2ba49962 (diff) | |
| download | ffmpeg-eeb6efcd58bc4a4022bf4b3e807d02ce66cad839.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
fate: add tests for unknown channel layouts.
lavfi/buffersrc: update for compatibility with the fork.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions