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
91d30579
Commit
91d30579
authored
Aug 22, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE
The HAVE_ prefix is reserved for macros set by configure.
parent
ff4d1aa8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
get_bits.h
libavcodec/get_bits.h
+2
-2
golomb.h
libavcodec/golomb.h
+2
-2
No files found.
libavcodec/get_bits.h
View file @
91d30579
...
...
@@ -128,14 +128,14 @@ typedef struct RL_VLC_ELEM {
unsigned int name ## _index = (gb)->index; \
unsigned int av_unused name ## _cache = 0
#define
HAVE_BITS_REMAINING
(name, gb) 1
#define
BITS_AVAILABLE
(name, gb) 1
#else
#define OPEN_READER(name, gb) \
unsigned int name ## _index = (gb)->index; \
unsigned int av_unused name ## _cache = 0; \
unsigned int av_unused name ## _size_plus8 = (gb)->size_in_bits_plus8
#define
HAVE_BITS_REMAINING
(name, gb) name ## _index < name ## _size_plus8
#define
BITS_AVAILABLE
(name, gb) name ## _index < name ## _size_plus8
#endif
#define CLOSE_READER(name, gb) (gb)->index = name ## _index
...
...
libavcodec/golomb.h
View file @
91d30579
...
...
@@ -138,7 +138,7 @@ static inline unsigned svq3_get_ue_golomb(GetBitContext *gb)
ret
=
(
ret
<<
4
)
|
ff_interleaved_dirac_golomb_vlc_code
[
buf
];
UPDATE_CACHE
(
re
,
gb
);
buf
=
GET_CACHE
(
re
,
gb
);
}
while
(
HAVE_BITS_REMAINING
(
re
,
gb
));
}
while
(
BITS_AVAILABLE
(
re
,
gb
));
CLOSE_READER
(
re
,
gb
);
return
ret
-
1
;
...
...
@@ -328,7 +328,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
return
buf
;
}
else
{
int
i
;
for
(
i
=
0
;
i
<
limit
&&
SHOW_UBITS
(
re
,
gb
,
1
)
==
0
&&
HAVE_BITS_REMAINING
(
re
,
gb
);
i
++
)
{
for
(
i
=
0
;
i
<
limit
&&
SHOW_UBITS
(
re
,
gb
,
1
)
==
0
&&
BITS_AVAILABLE
(
re
,
gb
);
i
++
)
{
LAST_SKIP_BITS
(
re
,
gb
,
1
);
UPDATE_CACHE
(
re
,
gb
);
}
...
...
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