summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/cabac.h
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-05-30 19:24:17 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-05-30 19:24:17 +0000
commitdf5fbeb013e70f14090cec1998a5f923d6713a1d (patch)
treede31c29919f53b88f27bdb7add18706b1b51ddcc /src/libffmpeg/libavcodec/cabac.h
parent26de73d1e48ab23af83e352cdc6e9eac41bf8c3b (diff)
downloadxine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.gz
xine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.bz2
merge ffmpeg to fix compiler warnings
CVS patchset: 6612 CVS date: 2004/05/30 19:24:17
Diffstat (limited to 'src/libffmpeg/libavcodec/cabac.h')
-rw-r--r--src/libffmpeg/libavcodec/cabac.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/cabac.h b/src/libffmpeg/libavcodec/cabac.h
index 852d47ebe..05c47363d 100644
--- a/src/libffmpeg/libavcodec/cabac.h
+++ b/src/libffmpeg/libavcodec/cabac.h
@@ -37,8 +37,8 @@ typedef struct CABACContext{
uint8_t lps_range[2*64][4]; ///< rangeTabLPS
uint8_t lps_state[2*64]; ///< transIdxLPS
uint8_t mps_state[2*64]; ///< transIdxMPS
- uint8_t *bytestream_start;
- uint8_t *bytestream;
+ const uint8_t *bytestream_start;
+ const uint8_t *bytestream;
int bits_left; ///<
PutBitContext pb;
}CABACContext;
@@ -48,7 +48,7 @@ extern const uint8_t ff_h264_mps_state[64];
extern const uint8_t ff_h264_lps_state[64];
void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size);
-void ff_init_cabac_decoder(CABACContext *c, uint8_t *buf, int buf_size);
+void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size);
void ff_init_cabac_states(CABACContext *c, uint8_t const (*lps_range)[4],
uint8_t const *mps_state, uint8_t const *lps_state, int state_count);