cabac: x86 version of get_cabac_bypass

[ffmpeg] / libavcodec / internal.h

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 75bd4b9b1b68ebff350169ed0b6f82f962370a31..f57bedc8cf275b525b17674ce3c4a2a2c244174b 100644 (file)
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -30,8 +30,9 @@
 #include "libavutil/mathematics.h"
 #include "libavutil/pixfmt.h"
 #include "avcodec.h"
+#include "config.h"
 
-#define FF_SANE_NB_CHANNELS 128U
+#define FF_SANE_NB_CHANNELS 63U
 
 typedef struct FramePool {
     /**
@@ -76,14 +77,6 @@ typedef struct AVCodecInternal {
      */
     int allocate_progress;
 
-#if FF_API_OLD_ENCODE_AUDIO
-    /**
-     * Internal sample count used by avcodec_encode_audio() to fabricate pts.
-     * Can be removed along with avcodec_encode_audio().
-     */
-    int sample_count;
-#endif
-
     /**
      * An audio frame with less than required samples has been submitted and
      * padded with silence. Reject all subsequent frames.
@@ -169,4 +162,8 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags);
  */
 int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame);
 
+const uint8_t *avpriv_find_start_code(const uint8_t *restrict p,
+                                      const uint8_t *end,
+                                      uint32_t *restrict state);
+
 #endif /* AVCODEC_INTERNAL_H */