diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 01:32:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 01:32:37 +0100 |
| commit | b7d8484f272b7a5a2ed9db76d5182dbd6e3e6992 (patch) | |
| tree | bcccbc78b279cd208a485fac81998118a415926e /libavcodec/ac3dec.h | |
| parent | 78ac7ee97040a2e9a69b81f82a89edd779e124bb (diff) | |
| parent | b8f3ab8e6a7ce3627764da53b809628c828d4047 (diff) | |
| download | ffmpeg-streaming-b7d8484f272b7a5a2ed9db76d5182dbd6e3e6992.zip ffmpeg-streaming-b7d8484f272b7a5a2ed9db76d5182dbd6e3e6992.tar.gz | |
Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'
* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
ac3dec: output planar float only
svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
configure: Have protocols select network code instead of depending on it
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3dec.h')
| -rw-r--r-- | libavcodec/ac3dec.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index c3a43bf..ee27727 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -201,7 +201,6 @@ typedef struct AC3DecodeContext { DSPContext dsp; ///< for optimization AC3DSPContext ac3dsp; FmtConvertContext fmt_conv; ///< optimized conversion functions - float mul_bias; ///< scaling for float_to_int16 conversion ///@} ///@name Aligned arrays |
