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

avcodec/vc1_block: move early exit code up in ff_vc1_pred_dc()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
zhaoxiu.zeng 2015-02-25 00:28:45 +08:00 committed by Michael Niedermayer
parent 9914502264
commit 137fbab11b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/vc1_block.c
View File

@ -388,6 +388,12 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n,
int q1, q2 = 0; int q1, q2 = 0;
int dqscale_index; int dqscale_index;
/* scale predictors if needed */
q1 = s->current_picture.qscale_table[mb_pos];
dqscale_index = s->y_dc_scale_table[q1] - 1;
if (dqscale_index < 0)
return 0;
wrap = s->block_wrap[n]; wrap = s->block_wrap[n];
dc_val = s->dc_val[0] + s->block_index[n]; dc_val = s->dc_val[0] + s->block_index[n];
@ -397,11 +403,7 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n,
c = dc_val[ - 1]; c = dc_val[ - 1];
b = dc_val[ - 1 - wrap]; b = dc_val[ - 1 - wrap];
a = dc_val[ - wrap]; a = dc_val[ - wrap];
/* scale predictors if needed */
q1 = s->current_picture.qscale_table[mb_pos];
dqscale_index = s->y_dc_scale_table[q1] - 1;
if (dqscale_index < 0)
return 0;
if (c_avail && (n != 1 && n != 3)) { if (c_avail && (n != 1 && n != 3)) {
q2 = s->current_picture.qscale_table[mb_pos - 1]; q2 = s->current_picture.qscale_table[mb_pos - 1];
if (q2 && q2 != q1) if (q2 && q2 != q1)