diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 23:58:00 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 23:58:00 +0200 |
commit | 877716a79c9d649624b67b1fa328825e2c055cc9 (patch) | |
tree | fd7ef8f7f7919eb819809ca575abcf642950f7d5 /libavcodec/opus_celt.c | |
parent | 5a55d5e44575ea70c20dfea108c8cc038e1463c5 (diff) | |
parent | 6a927d7aaf5625e83a674072913b9e292a303fd1 (diff) | |
download | ffmpeg-877716a79c9d649624b67b1fa328825e2c055cc9.tar.gz |
Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'
* commit '6a927d7aaf5625e83a674072913b9e292a303fd1':
output example: use a macro instead of a static variable
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/opus_celt.c')
0 files changed, 0 insertions, 0 deletions