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 /libavformat/data_uri.c | |
| 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 'libavformat/data_uri.c')
0 files changed, 0 insertions, 0 deletions