diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-20 22:24:31 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-20 22:24:43 +0100 |
commit | 0a1146a59a1c0a97e879cd2683b01db59d9a5144 (patch) | |
tree | a8ab1ed80553f286eed21e5a960745b8ef513c8e /libavformat/ffmenc.c | |
parent | 7b7f8d3ed03d5d8f6c042644bf82a86ae2f996e4 (diff) | |
parent | b8d18a94376c44dac9523dc3317259a30fc92f8b (diff) | |
download | ffmpeg-0a1146a59a1c0a97e879cd2683b01db59d9a5144.tar.gz |
Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'
* commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b':
libavcodec: Don't use av_cold annotation in twinvq header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmenc.c')
0 files changed, 0 insertions, 0 deletions