diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 11:37:59 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 14:19:47 +0100 |
| commit | 75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea (patch) | |
| tree | 369865d57435f7c2226f2ac664c1829aba00edb3 | |
| parent | e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4 (diff) | |
| download | ffmpeg-75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea.tar.gz | |
mpeg4videoenc: write 0 instead of vol_sprite_usage
That field is never set for encoding.
| -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 7daaf268a6..14c9f65ee4 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1039,9 +1039,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)*/ @@ -1113,8 +1113,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 */ |