VP3: Do not ignore error from read_huffman_tree().

[ffmpeg] / libavcodec / cabac.c

diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index e12533818fea674ae26e65d57d759bfa462107c8..c2a7f8a1e535d86800feca0f5288472fd416fe89 100644 (file)
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -20,13 +20,13 @@
  */
 
 /**
- * @file cabac.c
+ * @file libavcodec/cabac.c
  * Context Adaptive Binary Arithmetic Coder.
  */
 
 #include <string.h>
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "bitstream.h"
 #include "cabac.h"
 
@@ -183,6 +183,7 @@ void ff_init_cabac_states(CABACContext *c){
 #define SIZE 10240
 
 #include "avcodec.h"
+#include "cabac.h"
 
 int main(void){
     CABACContext c;
@@ -192,7 +193,7 @@ int main(void){
     uint8_t state[10]= {0};
 
     ff_init_cabac_encoder(&c, b, SIZE);
-    ff_init_cabac_states(&c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64);
+    ff_init_cabac_states(&c);
 
     for(i=0; i<SIZE; i++){
         r[i]= random()%7;