Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
b574e1e9
Commit
b574e1e9
authored
Aug 22, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get_bits: Add OPEN_READER macro variant w/o size_plus8
This avoids a trillion warnings from MSVC.
parent
b21e989a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
dvdec.c
libavcodec/dvdec.c
+1
-1
get_bits.h
libavcodec/get_bits.h
+7
-6
No files found.
libavcodec/dvdec.c
View file @
b574e1e9
...
@@ -88,7 +88,7 @@ static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, int16_t *block)
...
@@ -88,7 +88,7 @@ static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, int16_t *block)
int
partial_bit_count
=
mb
->
partial_bit_count
;
int
partial_bit_count
=
mb
->
partial_bit_count
;
int
level
,
run
,
vlc_len
,
index
;
int
level
,
run
,
vlc_len
,
index
;
OPEN_READER
(
re
,
gb
);
OPEN_READER
_NOSIZE
(
re
,
gb
);
UPDATE_CACHE
(
re
,
gb
);
UPDATE_CACHE
(
re
,
gb
);
/* if we must parse a partial VLC, we do it here */
/* if we must parse a partial VLC, we do it here */
...
...
libavcodec/get_bits.h
View file @
b574e1e9
...
@@ -123,17 +123,18 @@ typedef struct RL_VLC_ELEM {
...
@@ -123,17 +123,18 @@ typedef struct RL_VLC_ELEM {
# define MIN_CACHE_BITS 25
# define MIN_CACHE_BITS 25
#endif
#endif
#if UNCHECKED_BITSTREAM_READER
#define OPEN_READER_NOSIZE(name, gb) \
#define OPEN_READER(name, gb) \
unsigned int name ## _index = (gb)->index; \
unsigned int name ## _index = (gb)->index; \
unsigned int av_unused name ## _cache = 0
unsigned int av_unused name ## _cache = 0
#if UNCHECKED_BITSTREAM_READER
#define OPEN_READER(name, gb) OPEN_READER_NOSIZE(name, gb)
#define BITS_AVAILABLE(name, gb) 1
#define BITS_AVAILABLE(name, gb) 1
#else
#else
#define OPEN_READER(name, gb) \
#define OPEN_READER(name, gb) \
unsigned int name ## _index = (gb)->index; \
OPEN_READER_NOSIZE(name, gb); \
unsigned int av_unused name ## _cache = 0; \
unsigned int name ## _size_plus8 = (gb)->size_in_bits_plus8
unsigned int av_unused name ## _size_plus8 = (gb)->size_in_bits_plus8
#define BITS_AVAILABLE(name, gb) name ## _index < name ## _size_plus8
#define BITS_AVAILABLE(name, gb) name ## _index < name ## _size_plus8
#endif
#endif
...
@@ -254,7 +255,7 @@ static inline unsigned int get_bits(GetBitContext *s, int n)
...
@@ -254,7 +255,7 @@ static inline unsigned int get_bits(GetBitContext *s, int n)
static
inline
unsigned
int
show_bits
(
GetBitContext
*
s
,
int
n
)
static
inline
unsigned
int
show_bits
(
GetBitContext
*
s
,
int
n
)
{
{
register
int
tmp
;
register
int
tmp
;
OPEN_READER
(
re
,
s
);
OPEN_READER
_NOSIZE
(
re
,
s
);
UPDATE_CACHE
(
re
,
s
);
UPDATE_CACHE
(
re
,
s
);
tmp
=
SHOW_UBITS
(
re
,
s
,
n
);
tmp
=
SHOW_UBITS
(
re
,
s
,
n
);
return
tmp
;
return
tmp
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment