Fix nv12/nv21 handling. linesize for plane 1 should account for both chroma

[ffmpeg] / libavcodec / cabac.h

diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index caed72277cfc9153990a8c75b30e79e160aa8d3f..2794626c35dc7c958e8ff6503a9bc4482e973b61 100644 (file)
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -20,14 +20,14 @@
  */
 
 /**
- * @file cabac.h
+ * @file libavcodec/cabac.h
  * Context Adaptive Binary Arithmetic Coder.
  */
 
 #ifndef AVCODEC_CABAC_H
 #define AVCODEC_CABAC_H
 
-#include "bitstream.h"
+#include "put_bits.h"
 
 //#undef NDEBUG
 #include <assert.h>
@@ -637,7 +637,7 @@ static int av_unused get_cabac_bypass(CABACContext *c){
 
 
 static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
-#if ARCH_X86 && !(defined(PIC) && defined(__GNUC__))
+#if ARCH_X86 && HAVE_EBX_AVAILABLE
     __asm__ volatile(
         "movl "RANGE    "(%1), %%ebx            \n\t"
         "movl "LOW      "(%1), %%eax            \n\t"