diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 22:44:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 22:46:11 +0200 |
| commit | 11991a7d9069dc80a0548d1521d227a3233deb1a (patch) | |
| tree | 5cf7805f82cd7c6c5b68fd5c79fdc52cdad9e53e /libavcodec/cga_data.h | |
| parent | a1c4635558cbb0a311022a0c74258118d09d260e (diff) | |
| parent | 5e7b125b6ae36893dfd9cb5661c99b67363cbb38 (diff) | |
| download | ffmpeg-11991a7d9069dc80a0548d1521d227a3233deb1a.tar.gz | |
Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'
* commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38':
output example: use the new AVFrame API to allocate audio frames
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cga_data.h')
0 files changed, 0 insertions, 0 deletions