diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 13:20:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 13:21:02 +0100 |
| commit | 010311d67337419b218f0834b019821b08552127 (patch) | |
| tree | 6f3daedd52d146ccace63070686b03f36e111896 /libavformat/matroska.h | |
| parent | a7fa1b9aa104491e44a0489e09febe036c70f4f9 (diff) | |
| parent | 749a89d1b8bb73b4d4f14c48f33259a1300c1761 (diff) | |
| download | ffmpeg-010311d67337419b218f0834b019821b08552127.tar.gz | |
Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'
* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
examples/transcode_aac: properly select the output sample format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
0 files changed, 0 insertions, 0 deletions