diff options
| -rw-r--r-- | libavcodec/rv34.c | 20 | ||||
| -rw-r--r-- | libavcodec/vc1dec.c | 1 | ||||
| -rw-r--r-- | libswscale/swscale.c | 11 |
3 files changed, 0 insertions, 32 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index c5dcfdcba4..98607ea7ff 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -424,17 +424,6 @@ static inline RV34VLC* choose_vlc_set(int quant, int mod, int type) } /** - * Decode quantizer difference and return modified quantizer. - */ -static inline int rv34_decode_dquant(GetBitContext *gb, int quant) -{ - if(get_bits1(gb)) - return rv34_dquant_tab[get_bits1(gb)][quant]; - else - return get_bits(gb, 5); -} - -/** * Decode macroblock header and return CBP in case of success, -1 otherwise. */ static int rv34_decode_mb_header(RV34DecContext *r, int8_t *intra_types) @@ -1255,15 +1244,6 @@ static int check_slice_end(RV34DecContext *r, MpegEncContext *s) return 0; } -static inline int slice_compare(SliceInfo *si1, SliceInfo *si2) -{ - return si1->type != si2->type || - si1->start >= si2->start || - si1->width != si2->width || - si1->height != si2->height|| - si1->pts != si2->pts; -} - static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int buf_size) { MpegEncContext *s = &r->s; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 8fca2da738..cf828dd1f0 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -45,7 +45,6 @@ #define MB_INTRA_VLC_BITS 9 #define DC_VLC_BITS 9 #define AC_VLC_BITS 9 -static const uint16_t table_mb_intra[64][2]; static const uint16_t vlc_offs[] = { diff --git a/libswscale/swscale.c b/libswscale/swscale.c index dacf40ed8a..14807fdc46 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -80,17 +80,6 @@ untested special converters #define RV ( (int)(0.500*224/255*(1<<RGB2YUV_SHIFT)+0.5)) #define RU (-(int)(0.169*224/255*(1<<RGB2YUV_SHIFT)+0.5)) -static const double rgb2yuv_table[8][9]={ - {0.7152, 0.0722, 0.2126, -0.386, 0.5, -0.115, -0.454, -0.046, 0.5}, //ITU709 - {0.7152, 0.0722, 0.2126, -0.386, 0.5, -0.115, -0.454, -0.046, 0.5}, //ITU709 - {0.587 , 0.114 , 0.299 , -0.331, 0.5, -0.169, -0.419, -0.081, 0.5}, //DEFAULT / ITU601 / ITU624 / SMPTE 170M - {0.587 , 0.114 , 0.299 , -0.331, 0.5, -0.169, -0.419, -0.081, 0.5}, //DEFAULT / ITU601 / ITU624 / SMPTE 170M - {0.59 , 0.11 , 0.30 , -0.331, 0.5, -0.169, -0.421, -0.079, 0.5}, //FCC - {0.587 , 0.114 , 0.299 , -0.331, 0.5, -0.169, -0.419, -0.081, 0.5}, //DEFAULT / ITU601 / ITU624 / SMPTE 170M - {0.587 , 0.114 , 0.299 , -0.331, 0.5, -0.169, -0.419, -0.081, 0.5}, //DEFAULT / ITU601 / ITU624 / SMPTE 170M - {0.701 , 0.087 , 0.212 , -0.384, 0.5, -0.116, -0.445, -0.055, 0.5}, //SMPTE 240M -}; - /* NOTES Special versions: fast Y 1:1 scaling (no interpolation in y direction) |