diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-11-14 23:27:44 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-11-14 23:27:44 +0000 |
| commit | f54c7a0aff71f4efe4d75af3f53c668ba5b11229 (patch) | |
| tree | e7dac6c0309bf973e9264c0abc69b2901e466db4 /src/libffmpeg/libavcodec/common.h | |
| parent | dd8530be7f27c2a42e1adb7ab9363a3604d7c493 (diff) | |
| download | xine-lib-f54c7a0aff71f4efe4d75af3f53c668ba5b11229.tar.gz xine-lib-f54c7a0aff71f4efe4d75af3f53c668ba5b11229.tar.bz2 | |
sync and enable dv decoder
CVS patchset: 3261
CVS date: 2002/11/14 23:27:44
Diffstat (limited to 'src/libffmpeg/libavcodec/common.h')
| -rw-r--r-- | src/libffmpeg/libavcodec/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h index 822233112..348fb7d3f 100644 --- a/src/libffmpeg/libavcodec/common.h +++ b/src/libffmpeg/libavcodec/common.h @@ -647,7 +647,7 @@ static inline void skip_bits1(GetBitContext *s){ void init_get_bits(GetBitContext *s, UINT8 *buffer, int buffer_size); -int check_marker(GetBitContext *s, char *msg); +int check_marker(GetBitContext *s, const char *msg); void align_get_bits(GetBitContext *s); int init_vlc(VLC *vlc, int nb_bits, int nb_codes, const void *bits, int bits_wrap, int bits_size, @@ -844,7 +844,7 @@ static inline int ff_sqrt(int a) /** * converts fourcc string to int */ -static inline int ff_get_fourcc(char *s){ +static inline int ff_get_fourcc(const char *s){ assert( strlen(s)==4 ); return (s[0]) + (s[1]<<8) + (s[2]<<16) + (s[3]<<24); |