You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
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>
This commit is contained in:
committed by
Mark Thompson
parent
a53f9fde45
commit
ad2745e867
@@ -648,7 +648,6 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc)
|
|||||||
#undef xf
|
#undef xf
|
||||||
#undef xsu
|
#undef xsu
|
||||||
#undef uvlc
|
#undef uvlc
|
||||||
#undef leb128
|
|
||||||
#undef ns
|
#undef ns
|
||||||
#undef increment
|
#undef increment
|
||||||
#undef subexp
|
#undef subexp
|
||||||
@@ -720,17 +719,17 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc)
|
|||||||
|
|
||||||
#include "cbs_av1_syntax_template.c"
|
#include "cbs_av1_syntax_template.c"
|
||||||
|
|
||||||
#undef READ
|
#undef WRITE
|
||||||
#undef READWRITE
|
#undef READWRITE
|
||||||
#undef RWContext
|
#undef RWContext
|
||||||
#undef xf
|
#undef xf
|
||||||
#undef xsu
|
#undef xsu
|
||||||
#undef uvlc
|
#undef uvlc
|
||||||
#undef leb128
|
|
||||||
#undef ns
|
#undef ns
|
||||||
#undef increment
|
#undef increment
|
||||||
#undef subexp
|
#undef subexp
|
||||||
#undef delta_q
|
#undef delta_q
|
||||||
|
#undef leb128
|
||||||
#undef infer
|
#undef infer
|
||||||
#undef byte_alignment
|
#undef byte_alignment
|
||||||
|
|
||||||
|
@@ -75,7 +75,7 @@
|
|||||||
|
|
||||||
#include "cbs_jpeg_syntax_template.c"
|
#include "cbs_jpeg_syntax_template.c"
|
||||||
|
|
||||||
#undef READ
|
#undef WRITE
|
||||||
#undef READWRITE
|
#undef READWRITE
|
||||||
#undef RWContext
|
#undef RWContext
|
||||||
#undef FUNC
|
#undef FUNC
|
||||||
|
@@ -118,7 +118,7 @@
|
|||||||
|
|
||||||
#include "cbs_mpeg2_syntax_template.c"
|
#include "cbs_mpeg2_syntax_template.c"
|
||||||
|
|
||||||
#undef READ
|
#undef WRITE
|
||||||
#undef READWRITE
|
#undef READWRITE
|
||||||
#undef RWContext
|
#undef RWContext
|
||||||
#undef xui
|
#undef xui
|
||||||
|
@@ -395,7 +395,7 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc,
|
|||||||
|
|
||||||
#include "cbs_vp9_syntax_template.c"
|
#include "cbs_vp9_syntax_template.c"
|
||||||
|
|
||||||
#undef READ
|
#undef WRITE
|
||||||
#undef READWRITE
|
#undef READWRITE
|
||||||
#undef RWContext
|
#undef RWContext
|
||||||
#undef xf
|
#undef xf
|
||||||
|
Reference in New Issue
Block a user