RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/h261enc: fix dquant encoding 

Fixes Ticket4111

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-31 04:57:50 +01:00
parent f5722ba276
commit 9f73b88c62
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h261enc.c
View File

@ -250,12 +250,13 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64],
/* mvd indicates if this block is motion compensated */ /* mvd indicates if this block is motion compensated */
mvd = motion_x | motion_y; mvd = motion_x | motion_y;
if ((cbp | mvd | s->dquant) == 0) { if ((cbp | mvd) == 0) {
/* skip macroblock */ /* skip macroblock */
s->skip_count++; s->skip_count++;
s->mb_skip_run++; s->mb_skip_run++;
s->last_mv[0][0][0] = 0; s->last_mv[0][0][0] = 0;
s->last_mv[0][0][1] = 0; s->last_mv[0][0][1] = 0;
s->qscale -= s->dquant;
return; return;
} }
} }
@ -274,13 +275,15 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64],
h->mtype += 3; h->mtype += 3;
if (s->loop_filter) if (s->loop_filter)
h->mtype += 3; h->mtype += 3;
if (cbp || s->dquant) if (cbp)
h->mtype++; h->mtype++;
av_assert1(h->mtype > 1); av_assert1(h->mtype > 1);
} }
if (s->dquant) if (s->dquant && cbp) {
h->mtype++; h->mtype++;
} else
s->qscale -= s->dquant;
put_bits(&s->pb, put_bits(&s->pb,
ff_h261_mtype_bits[h->mtype], ff_h261_mtype_bits[h->mtype],