diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 23:20:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 23:22:08 +0200 |
| commit | 5a55d5e44575ea70c20dfea108c8cc038e1463c5 (patch) | |
| tree | 3c99bcb9164c616b855381c39eb489d85ce0b5d7 /libavcodec/dct32_float.c | |
| parent | b9bfd888e551644c54971220ebf1f37effba4769 (diff) | |
| parent | 63fd0d866c8300a8f251a15b1535e9ce40a407fb (diff) | |
| download | ffmpeg-5a55d5e44575ea70c20dfea108c8cc038e1463c5.tar.gz | |
Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'
* commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb':
output example: allocate the audio frame only once
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct32_float.c')
0 files changed, 0 insertions, 0 deletions