diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 17:02:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 17:02:16 +0200 |
| commit | 36c5bb6a721a73b941a05500b32022d50e830207 (patch) | |
| tree | 6c6aedc88b24c79de58184dc6381513055125bc8 /libavcodec/bmpenc.c | |
| parent | 74409bff4ce90868b878f642873bf75a6c0ecee7 (diff) | |
| parent | b0b92ee04d1ee49a5d8b1aca718ea7d7d44932aa (diff) | |
| download | ffmpeg-36c5bb6a721a73b941a05500b32022d50e830207.tar.gz | |
Merge commit 'b0b92ee04d1ee49a5d8b1aca718ea7d7d44932aa' into release/2.2
* commit 'b0b92ee04d1ee49a5d8b1aca718ea7d7d44932aa':
aacpsy: correct calculation of minath in psy_3gpp_init
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmpenc.c')
0 files changed, 0 insertions, 0 deletions