diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 01:32:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 01:32:33 +0200 |
| commit | c1ac5896ef9a37fb2e198b7de36e477a9f1a69e9 (patch) | |
| tree | b922181f3232df248f6dadbba80d56593b10c59d /libavcodec/aacpsy.h | |
| parent | da97174dcb1457b2b47b07b5205610409469039e (diff) | |
| parent | 9c7321e2b8981ec867294309e9cf3833055df78f (diff) | |
| download | ffmpeg-c1ac5896ef9a37fb2e198b7de36e477a9f1a69e9.tar.gz | |
Merge commit '9c7321e2b8981ec867294309e9cf3833055df78f' into release/0.10
* commit '9c7321e2b8981ec867294309e9cf3833055df78f':
sgidec: fix an incorrect backport
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsy.h')
0 files changed, 0 insertions, 0 deletions