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

avcodec/rv10: cleanup rpr handling

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-01-04 04:15:22 +01:00
parent adc09a353c
commit 958e311974
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/rv10.c
View File

@@ -300,7 +300,7 @@ static int rv20_decode_picture_header(RVDecContext *rv)
{ {
MpegEncContext *s = &rv->m; MpegEncContext *s = &rv->m;
int seq, mb_pos, i, ret; int seq, mb_pos, i, ret;
int rpr_bits; int rpr_max;
i = get_bits(&s->gb, 2); i = get_bits(&s->gb, 2);
switch(i) { switch(i) {
@@ -341,10 +341,10 @@ static int rv20_decode_picture_header(RVDecContext *rv)
else else
seq = get_bits(&s->gb, 13) << 2; seq = get_bits(&s->gb, 13) << 2;
rpr_bits = s->avctx->extradata[1] & 7; rpr_max = s->avctx->extradata[1] & 7;
if (rpr_bits) { if (rpr_max) {
int f, new_w, new_h; int f, new_w, new_h;
rpr_bits = FFMIN((rpr_bits >> 1) + 1, 3); int rpr_bits = av_log2(rpr_max) + 1;
f = get_bits(&s->gb, rpr_bits); f = get_bits(&s->gb, rpr_bits);
@@ -387,7 +387,7 @@ static int rv20_decode_picture_header(RVDecContext *rv)
} }
if (s->avctx->debug & FF_DEBUG_PICT_INFO) { if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, rpr_bits); av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d/%d\n", f, rpr_bits, rpr_max);
} }
} }
if (av_image_check_size(s->width, s->height, 0, s->avctx) < 0) if (av_image_check_size(s->width, s->height, 0, s->avctx) < 0)