diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-08 17:25:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-08 17:42:56 +0100 |
| commit | a30f7918b52d076c55a42bef3a731165b354bf08 (patch) | |
| tree | f659d43c5ff88425e8d2c740dfe191da87e5988c /libavcodec/h263data.h | |
| parent | f8a9cf77040e1b2ed83206269ead11aa30afb98d (diff) | |
| parent | 0338c396987c82b41d322630ea9712fe5f9561d6 (diff) | |
| download | ffmpeg-a30f7918b52d076c55a42bef3a731165b354bf08.tar.gz | |
Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'
* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
dsputil: Split off H.263 bits into their own H263DSPContext
Conflicts:
configure
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263data.h')
| -rw-r--r-- | libavcodec/h263data.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h index e245e2f635..1cd965f19a 100644 --- a/libavcodec/h263data.h +++ b/libavcodec/h263data.h @@ -272,11 +272,6 @@ const uint8_t ff_mba_length[7]={ 6, 7, 9, 11, 13, 14, 14 }; -const uint8_t ff_h263_loop_filter_strength[32]={ -// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 - 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12 -}; - const AVRational ff_h263_pixel_aspect[16]={ {0, 1}, {1, 1}, |