cbs_av1, cbs_jpeg, cbs_mpeg2, cbs_vp9: Fix undef

READ has already been undefined at this point; it is obviously intended to undef WRITE. Furthermore, leb128 (in cbs_av1) was undefined too often and inconsistently. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
6 years ago · ad2745e867
parent a53f9fde45
commit ad2745e867
4 changed files with 5 additions and 6 deletions
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@ -648,7 +648,6 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc)
 #undef xf
 #undef xsu
 #undef uvlc
 #undef leb128
 #undef ns
 #undef increment
 #undef subexp
@ -720,17 +719,17 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc)
 #include "cbs_av1_syntax_template.c"
-#undef READ
+#undef WRITE
 #undef READWRITE
 #undef RWContext
 #undef xf
 #undef xsu
 #undef uvlc
 #undef leb128
 #undef ns
 #undef increment
 #undef subexp
 #undef delta_q
 #undef leb128
 #undef infer
 #undef byte_alignment
--- a/libavcodec/cbs_jpeg.c
+++ b/libavcodec/cbs_jpeg.c
@ -75,7 +75,7 @@
 #include "cbs_jpeg_syntax_template.c"
-#undef READ
+#undef WRITE
 #undef READWRITE
 #undef RWContext
 #undef FUNC
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@ -118,7 +118,7 @@
 #include "cbs_mpeg2_syntax_template.c"
-#undef READ
+#undef WRITE
 #undef READWRITE
 #undef RWContext
 #undef xui
--- a/libavcodec/cbs_vp9.c
+++ b/libavcodec/cbs_vp9.c
@ -395,7 +395,7 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc,
 #include "cbs_vp9_syntax_template.c"
-#undef READ
+#undef WRITE
 #undef READWRITE
 #undef RWContext
 #undef xf