This macro is empty since the removal of the A32 bitstream reader.
Signed-off-by: Mans Rullgard <[email protected]>
---
libavcodec/get_bits.h | 6 +-----
libavcodec/mpeg4videodec.c | 8 ++++----
libavcodec/msmpeg4.c | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index 9376b11..8abfde1 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -108,11 +108,8 @@ SKIP_CACHE(name, gb, num)
SKIP_COUNTER(name, gb, num)
will increment the internal bit counter (see SKIP_CACHE & SKIP_BITS)
-LAST_SKIP_CACHE(name, gb, num)
- will remove the next num bits from the cache if it is needed for
UPDATE_CACHE otherwise it will do nothing
-
LAST_SKIP_BITS(name, gb, num)
- is equivalent to LAST_SKIP_CACHE; SKIP_COUNTER
+ like SKIP_BITS, to be used if next call is UPDATE_CACHE or CLOSE_READER
for examples see get_bits, show_bits, skip_bits, get_vlc
*/
@@ -168,7 +165,6 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
} while (0)
#define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num)
-#define LAST_SKIP_CACHE(name, gb, num)
#ifdef ALT_BITSTREAM_READER_LE
# define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index f5835f3..e15c348 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -934,7 +934,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s,
DCTELEM * block,
}; SKIP_CACHE(re, &s->gb, 1);
last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1);
- run= SHOW_UBITS(re, &s->gb, 6); LAST_SKIP_CACHE(re, &s->gb,
6);
+ run= SHOW_UBITS(re, &s->gb, 6);
SKIP_COUNTER(re, &s->gb, 1+1+6);
UPDATE_CACHE(re, &s->gb);
@@ -951,7 +951,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s,
DCTELEM * block,
}; SKIP_CACHE(re, &s->gb, 5);
level= level * qmul + qadd;
- level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re,
&s->gb, 1); LAST_SKIP_CACHE(re, &s->gb, 1);
+ level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re,
&s->gb, 1);
SKIP_COUNTER(re, &s->gb, 1+11+5+1);
i+= run + 1;
@@ -968,7 +968,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s,
DCTELEM * block,
/* third escape */
SKIP_CACHE(re, &s->gb, 2);
last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb,
1);
- run= SHOW_UBITS(re, &s->gb, 6); LAST_SKIP_CACHE(re,
&s->gb, 6);
+ run= SHOW_UBITS(re, &s->gb, 6);
SKIP_COUNTER(re, &s->gb, 2+1+6);
UPDATE_CACHE(re, &s->gb);
@@ -985,7 +985,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s,
DCTELEM * block,
if(SHOW_UBITS(re, &s->gb, 1)==0){
av_log(s->avctx, AV_LOG_ERROR, "2. marker bit
missing in 3. esc\n");
return -1;
- }; LAST_SKIP_CACHE(re, &s->gb, 1);
+ }
SKIP_COUNTER(re, &s->gb, 1+12+1);
}
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index ee2ae3d..11a1915 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -1691,7 +1691,7 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM *
block,
if(s->msmpeg4_version<=3){
last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re,
&s->gb, 1);
run= SHOW_UBITS(re, &s->gb, 6); SKIP_CACHE(re,
&s->gb, 6);
- level= SHOW_SBITS(re, &s->gb, 8); LAST_SKIP_CACHE(re,
&s->gb, 8);
+ level= SHOW_SBITS(re, &s->gb, 8);
SKIP_COUNTER(re, &s->gb, 1+6+8);
}else{
int sign;
--
1.7.8
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
