diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 02:15:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 02:15:47 +0100 |
| commit | a9a3afec1a9c57a344f4ec09b6ba3db338a3c8bc (patch) | |
| tree | 6a103ce61a49221879e4d4d1202c4b6c38f13304 /libavutil/x86 | |
| parent | f1db007e008d3ece791c7ac65c537d1d301ea0cc (diff) | |
| parent | 5145ccf02b1771233c1b33b5bd20a8bd94a3c15c (diff) | |
| download | ffmpeg-a9a3afec1a9c57a344f4ec09b6ba3db338a3c8bc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacsbr: Add some const casts to silence warnings in ff_sbr_apply()
Conflicts:
libavcodec/aacsbr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86')
0 files changed, 0 insertions, 0 deletions