diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 11:41:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 11:41:30 +0200 |
| commit | cced6f4d58168096f13a4d34555754717979429d (patch) | |
| tree | c2febbecb61ae395f7281e7131735c1effc1c4ff /libavcodec/cabac_functions.h | |
| parent | 0f85c96091e9e2c1ab0b939cd966c7c7220dadb0 (diff) | |
| parent | e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb (diff) | |
| download | ffmpeg-cced6f4d58168096f13a4d34555754717979429d.tar.gz | |
Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'
* commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb':
indeo: use a typedef for the mc function pointer
cabac: x86 version of get_cabac_bypass
aic: use chroma scan tables while decoding luma component in progressive mode
Conflicts:
libavcodec/aic.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cabac_functions.h')
| -rw-r--r-- | libavcodec/cabac_functions.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h index ee70fcf985..8a7275d9de 100644 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@ -111,6 +111,7 @@ static int av_unused get_cabac(CABACContext *c, uint8_t * const state){ return get_cabac_inline(c,state); } +#ifndef get_cabac_bypass static int av_unused get_cabac_bypass(CABACContext *c){ int range; c->low += c->low; @@ -126,7 +127,7 @@ static int av_unused get_cabac_bypass(CABACContext *c){ return 1; } } - +#endif #ifndef get_cabac_bypass_sign static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ |