diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:58:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:59:02 +0100 |
| commit | f602e22122473a8b717affc503583a42bccf0be9 (patch) | |
| tree | 5440f0d181a273ed1eac597a0c2e671c9702072d /libavcodec | |
| parent | e2f63be01284024a39a97dff9237eb4cbbb5dbbf (diff) | |
| parent | 75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea (diff) | |
| download | ffmpeg-f602e22122473a8b717affc503583a42bccf0be9.tar.gz | |
Merge commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea'
* commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea':
mpeg4videoenc: write 0 instead of vol_sprite_usage
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg4videoenc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 3a84f7aba6..993cb49fc4 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1048,9 +1048,9 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, put_bits(&s->pb, 1, s->progressive_sequence ? 0 : 1); put_bits(&s->pb, 1, 1); /* obmc disable */ if (vo_ver_id == 1) - put_bits(&s->pb, 1, s->vol_sprite_usage); /* sprite enable */ + put_bits(&s->pb, 1, 0); /* sprite enable */ else - put_bits(&s->pb, 2, s->vol_sprite_usage); /* sprite enable */ + put_bits(&s->pb, 2, 0); /* sprite enable */ put_bits(&s->pb, 1, 0); /* not 8 bit == false */ put_bits(&s->pb, 1, s->mpeg_quant); /* quant type= (0=h263 style)*/ @@ -1121,8 +1121,7 @@ void ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number) put_bits(&s->pb, s->time_increment_bits, time_mod); /* time increment */ put_bits(&s->pb, 1, 1); /* marker */ put_bits(&s->pb, 1, 1); /* vop coded */ - if (s->pict_type == AV_PICTURE_TYPE_P || - (s->pict_type == AV_PICTURE_TYPE_S && s->vol_sprite_usage == GMC_SPRITE)) { + if (s->pict_type == AV_PICTURE_TYPE_P) { put_bits(&s->pb, 1, s->no_rounding); /* rounding type */ } put_bits(&s->pb, 3, 0); /* intra dc VLC threshold */ |