diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 12:52:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 13:01:11 +0100 |
| commit | 9e22b8aca0fdecee332191fabded428e6a183d25 (patch) | |
| tree | be8d6f2874d2045e449796d046642d9a1d00c730 /libavcodec/aacpsdsp.h | |
| parent | 8617be28d074c4708d2c948cbc311737cf2fbf39 (diff) | |
| parent | 0ba8ba165b84a971dbe9356b57f272dc81410eaf (diff) | |
| download | ffmpeg-9e22b8aca0fdecee332191fabded428e6a183d25.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacps: Adjust some const qualifiers to suppress warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsdsp.h')
| -rw-r--r-- | libavcodec/aacpsdsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacpsdsp.h b/libavcodec/aacpsdsp.h index 74a8af61ea..0ef30236ec 100644 --- a/libavcodec/aacpsdsp.h +++ b/libavcodec/aacpsdsp.h @@ -38,7 +38,7 @@ typedef struct PSDSPContext { int i, int len); void (*decorrelate)(float (*out)[2], float (*delay)[2], float (*ap_delay)[PS_QMF_TIME_SLOTS+PS_MAX_AP_DELAY][2], - const float phi_fract[2], float (*Q_fract)[2], + const float phi_fract[2], const float (*Q_fract)[2], const float *transient_gain, float g_decay_slope, int len); |