diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-03-23 13:34:23 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-03-28 09:58:26 +0200 |
| commit | add1467e5e447b79e8743a0b05c54dcf58c61dfe (patch) | |
| tree | 1c89ba2f739ee83774e567eab1b5bc2ca5fe0e8b /libavcodec/h264_ps.c | |
| parent | a4d126dc59c39bb03e5e444432d1b27af26a45b4 (diff) | |
| download | ffmpeg-add1467e5e447b79e8743a0b05c54dcf58c61dfe.tar.gz | |
svq3: drop the build dependency on the h264 decoder
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 34a2954ca1..d77fabf284 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -32,6 +32,7 @@ #include "mathops.h" #include "avcodec.h" #include "h264.h" +#include "h264data.h" #include "golomb.h" #define MAX_LOG2_MAX_FRAME_NUM (12 + 4) @@ -57,28 +58,6 @@ static const AVRational pixel_aspect[17] = { { 2, 1 }, }; -#define QP(qP, depth) ((qP) + 6 * ((depth) - 8)) - -#define CHROMA_QP_TABLE_END(d) \ - QP(0, d), QP(1, d), QP(2, d), QP(3, d), QP(4, d), QP(5, d), \ - QP(6, d), QP(7, d), QP(8, d), QP(9, d), QP(10, d), QP(11, d), \ - QP(12, d), QP(13, d), QP(14, d), QP(15, d), QP(16, d), QP(17, d), \ - QP(18, d), QP(19, d), QP(20, d), QP(21, d), QP(22, d), QP(23, d), \ - QP(24, d), QP(25, d), QP(26, d), QP(27, d), QP(28, d), QP(29, d), \ - QP(29, d), QP(30, d), QP(31, d), QP(32, d), QP(32, d), QP(33, d), \ - QP(34, d), QP(34, d), QP(35, d), QP(35, d), QP(36, d), QP(36, d), \ - QP(37, d), QP(37, d), QP(37, d), QP(38, d), QP(38, d), QP(38, d), \ - QP(39, d), QP(39, d), QP(39, d), QP(39, d) - -const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM + 1] = { - { CHROMA_QP_TABLE_END(8) }, - { 0, 1, 2, 3, 4, 5, - CHROMA_QP_TABLE_END(9) }, - { 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, - CHROMA_QP_TABLE_END(10) }, -}; - static const uint8_t default_scaling4[2][16] = { { 6, 13, 20, 28, 13, 20, 28, 32, 20, 28, 32, 37, 28, 32, 37, 42 }, |