RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

* removing casualties of battle of the wits and English language 

Originally committed as revision 2902 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roman Shaposhnik 2004-03-18 04:19:34 +00:00
parent 7976241aef
commit 5825425795
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/common.h
View File

@ -281,6 +281,7 @@ struct PutBitContext;
typedef void (*WriteDataFunc)(void *, uint8_t *, int); typedef void (*WriteDataFunc)(void *, uint8_t *, int);
/* buf and buf_end must be present and used by every alternative writer. */
typedef struct PutBitContext { typedef struct PutBitContext {
#ifdef ALT_BITSTREAM_WRITER #ifdef ALT_BITSTREAM_WRITER
uint8_t *buf, *buf_end; uint8_t *buf, *buf_end;
@ -317,11 +318,6 @@ static inline int put_bits_count(PutBitContext *s)
#endif #endif
} }
static inline int put_bits_left(PutBitContext* s)
{
return (s->buf_end - s->buf) * 8 - put_bits_count(s);
}
/* pad the end of the output stream with zeros */ /* pad the end of the output stream with zeros */
static inline void flush_put_bits(PutBitContext *s) static inline void flush_put_bits(PutBitContext *s)
{ {
@ -344,7 +340,7 @@ void align_put_bits(PutBitContext *s);
void put_string(PutBitContext * pbc, char *s, int put_zero); void put_string(PutBitContext * pbc, char *s, int put_zero);
/* bit input */ /* bit input */
/* buffer, buffer_end and size_in_bits must be present and used by every reader */
typedef struct GetBitContext { typedef struct GetBitContext {
const uint8_t *buffer, *buffer_end; const uint8_t *buffer, *buffer_end;
#ifdef ALT_BITSTREAM_READER #ifdef ALT_BITSTREAM_READER
@ -914,16 +910,6 @@ static inline void init_get_bits(GetBitContext *s,
#endif #endif
} }
static inline int get_bits_left(GetBitContext *s)
{
return s->size_in_bits - get_bits_count(s);
}
static inline int get_bits_size(GetBitContext *s)
{
return s->size_in_bits;
}
int check_marker(GetBitContext *s, const char *msg); int check_marker(GetBitContext *s, const char *msg);
void align_get_bits(GetBitContext *s); void align_get_bits(GetBitContext *s);
int init_vlc(VLC *vlc, int nb_bits, int nb_codes, int init_vlc(VLC *vlc, int nb_bits, int nb_codes,

15
libavcodec/dv.c
View File

@ -240,6 +240,21 @@ static const int mb_area_start[5] = { 1, 6, 21, 43, 64 };
#warning only works with ALT_BITSTREAM_READER #warning only works with ALT_BITSTREAM_READER
#endif #endif
static inline int get_bits_left(GetBitContext *s)
{
return s->size_in_bits - get_bits_count(s);
}
static inline int get_bits_size(GetBitContext *s)
{
return s->size_in_bits;
}
static inline int put_bits_left(PutBitContext* s)
{
return (s->buf_end - s->buf) * 8 - put_bits_count(s);
}
/* decode ac coefs */ /* decode ac coefs */
static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, DCTELEM *block) static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, DCTELEM *block)
{ {