diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-06-20 01:49:38 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-06-20 22:36:29 +0100 |
| commit | 8fcc0e7978e03cbf7e6d872d34ca1ea4a7d97b87 (patch) | |
| tree | fbbb4fc73e5c3a07215a1e4c4a1cdd0749393c14 /libavcodec/cabac.c | |
| parent | eaa2d5a90a208fff0662b62da67b7b090b9fff8c (diff) | |
| download | ffmpeg-8fcc0e7978e03cbf7e6d872d34ca1ea4a7d97b87.tar.gz | |
cabac: remove BRANCHLESS_CABAC_DECODER switch
The code does not compile without this set.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/cabac.c')
| -rw-r--r-- | libavcodec/cabac.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 098cd6fad9..691beb0ae3 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -161,19 +161,11 @@ void ff_init_cabac_states(CABACContext *c){ ff_h264_mps_state[2*i+1]= 2*mps_state[i]+1; if( i ){ -#ifdef BRANCHLESS_CABAC_DECODER ff_h264_mlps_state[128-2*i-1]= 2*lps_state[i]+0; ff_h264_mlps_state[128-2*i-2]= 2*lps_state[i]+1; }else{ ff_h264_mlps_state[128-2*i-1]= 1; ff_h264_mlps_state[128-2*i-2]= 0; -#else - ff_h264_lps_state[2*i+0]= 2*lps_state[i]+0; - ff_h264_lps_state[2*i+1]= 2*lps_state[i]+1; - }else{ - ff_h264_lps_state[2*i+0]= 1; - ff_h264_lps_state[2*i+1]= 0; -#endif } } } |