generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavcodec/svq3: clarify unknown_flag by renaming to has_watermark

Browse Source 
The name is based on how the field is used in the code

Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-02 03:02:30 +02:00
parent dc4a6e4d5a
commit 4e8ee7acb8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/svq3.c
View File

@ -78,7 +78,7 @@ typedef struct SVQ3Context {
H264Picture *last_pic; H264Picture *last_pic;
int halfpel_flag; int halfpel_flag;
int thirdpel_flag; int thirdpel_flag;
int unknown_flag; int has_watermark;
int next_slice_index; int next_slice_index;
uint32_t watermark_key; uint32_t watermark_key;
uint8_t *buf; uint8_t *buf;
@ -843,7 +843,7 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
/* unknown fields */ /* unknown fields */
skip_bits1(&h->gb); skip_bits1(&h->gb);
if (s->unknown_flag) if (s->has_watermark)
skip_bits1(&h->gb); skip_bits1(&h->gb);
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->halfpel_flag = 1;
s->thirdpel_flag = 1; s->thirdpel_flag = 1;
s->unknown_flag = 0; s->has_watermark = 0;
/* prowl for the "SEQH" marker in the extradata */ /* prowl for the "SEQH" marker in the extradata */
extradata = (unsigned char *)avctx->extradata; extradata = (unsigned char *)avctx->extradata;
@ -1020,9 +1020,9 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
goto fail; goto fail;
} }
s->unknown_flag = get_bits1(&gb); s->has_watermark = get_bits1(&gb);
avctx->has_b_frames = !h->low_delay; avctx->has_b_frames = !h->low_delay;
if (s->unknown_flag) { if (s->has_watermark) {
#if CONFIG_ZLIB #if CONFIG_ZLIB
unsigned watermark_width = svq3_get_ue_golomb(&gb); unsigned watermark_width = svq3_get_ue_golomb(&gb);
unsigned watermark_height = svq3_get_ue_golomb(&gb); unsigned watermark_height = svq3_get_ue_golomb(&gb);