projects
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'
[ffmpeg.git]
/
libavcodec
/
cabac_functions.h
diff --git
a/libavcodec/cabac_functions.h
b/libavcodec/cabac_functions.h
index
ee70fcf
..
8a7275d
100644
(file)
--- 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);
}
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;
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;
}
}
return 1;
}
}
-
+#endif
#ifndef get_cabac_bypass_sign
static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
#ifndef get_cabac_bypass_sign
static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){