[FFmpeg-cvslog] libavcodec/svq3: clarify unknown_flag by renaming to has_watermark
Michael Niedermayer
git at videolan.org
Sat May 2 16:13:16 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 2 03:02:30 2015 +0200| [4e8ee7acb858747b2bcdfb2384f9504df3b00a3a] | committer: Michael Niedermayer
libavcodec/svq3: clarify unknown_flag by renaming to has_watermark
The name is based on how the field is used in the code
Reviewed-by: compn <tempn at mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e8ee7acb858747b2bcdfb2384f9504df3b00a3a
---
libavcodec/svq3.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 4b418ab..0683b0d 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -78,7 +78,7 @@ typedef struct SVQ3Context {
H264Picture *last_pic;
int halfpel_flag;
int thirdpel_flag;
- int unknown_flag;
+ int has_watermark;
int next_slice_index;
uint32_t watermark_key;
uint8_t *buf;
@@ -843,7 +843,7 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
/* unknown fields */
skip_bits1(&h->gb);
- if (s->unknown_flag)
+ if (s->has_watermark)
skip_bits1(&h->gb);
skip_bits1(&h->gb);
@@ -933,7 +933,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
s->halfpel_flag = 1;
s->thirdpel_flag = 1;
- s->unknown_flag = 0;
+ s->has_watermark = 0;
/* prowl for the "SEQH" marker in the extradata */
extradata = (unsigned char *)avctx->extradata;
@@ -1020,9 +1020,9 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
goto fail;
}
- s->unknown_flag = get_bits1(&gb);
+ s->has_watermark = get_bits1(&gb);
avctx->has_b_frames = !h->low_delay;
- if (s->unknown_flag) {
+ if (s->has_watermark) {
#if CONFIG_ZLIB
unsigned watermark_width = svq3_get_ue_golomb(&gb);
unsigned watermark_height = svq3_get_ue_golomb(&gb);
More information about the ffmpeg-cvslog
mailing list