diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:30:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:30:17 +0200 |
| commit | 75f8f702217fdeae9e2868c7ba80c03f9ec0958a (patch) | |
| tree | f18ccb504b4ea2d45407fc35a9cb8f8efb869bb6 /libavcodec/imcdata.h | |
| parent | 8554e21f79a88844c7b192b029c9f6257f8b66f1 (diff) | |
| parent | 30f515091c323da59c0f1b533703dedca2f4b95d (diff) | |
| download | ffmpeg-75f8f702217fdeae9e2868c7ba80c03f9ec0958a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: allow cropping to AVCodecContext.width/height
mov: set AVCodecContext.width/height for h264
iac: generate codec tables as they are supposed to be
indeo4: handle frame type 1 properly
lavu: change versioning script to include all av* prefixed symbols
Conflicts:
libavcodec/h264.c
libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imcdata.h')
| -rw-r--r-- | libavcodec/imcdata.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h index 7d61a197a6..64e7c7185e 100644 --- a/libavcodec/imcdata.h +++ b/libavcodec/imcdata.h @@ -44,25 +44,6 @@ static const int8_t cyclTab2[32] = { 12, 13, 14, 15, 16, 17, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}; -static const float iac_weights1[31] = { - 0.0538585, 0.0576251, 0.0645592, 0.0494032, 0.0428915, 0.0592188, - 0.0604145, 0.0673549, 0.0797351, 0.0972911, 0.119376, 0.144777, - 0.17181, 0.198625, 0.242918, 0.262113, 0.278434, 0.310752, - 0.319978, 0.328482, 0.354631, 0.380212, 0.388783, 0.400428, - 0.43096, 0.462397, 0.479469, 0.499329, 0.534526, 0.568631, - 0.589218 -}; - -static const float iac_weights2[31] = { - 0.000375307, 0.000450455, 0.000612191, 0.000297262, 0.000202956, - 0.000484887, 0.000511777, 0.000686431, 0.00108256, 0.00185267, - 0.00321869, 0.00541861, 0.00860266, 0.012726, 0.0219151, - 0.0269104, 0.0316774, 0.0426107, 0.046113, 0.0494974, - 0.0608692, 0.0734633, 0.0780208, 0.0844921, 0.103034, - 0.124606, 0.137421, 0.153336, 0.184296, 0.217792, - 0.239742 -}; - static const float imc_weights1[31] = { 0.119595, 0.123124, 0.129192, 9.97377e-2, 8.1923e-2, 9.61153e-2, 8.77885e-2, 8.61174e-2, 9.00882e-2, 9.91658e-2, 0.112991, 0.131126, 0.152886, 0.177292, 0.221782, 0.244917, 0.267386, |