diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:33:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:33:52 +0200 |
| commit | a137e50ee54cd902c436d15463c6e621623cc9ad (patch) | |
| tree | cd35fd68925ba2612944cac13cedbfd5c508127b /libavcodec/h261enc.c | |
| parent | fcc117af30bcf59c7ae61a90bdebba0472dd3ddc (diff) | |
| parent | dc1de0b958836545339611e9c050a1d4fdded263 (diff) | |
| download | ffmpeg-a137e50ee54cd902c436d15463c6e621623cc9ad.tar.gz | |
Merge commit 'dc1de0b958836545339611e9c050a1d4fdded263'
* commit 'dc1de0b958836545339611e9c050a1d4fdded263':
h261: Set 'still image mode off' in picture header
Conflicts:
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth2-h261
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261enc.c')
| -rw-r--r-- | libavcodec/h261enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index f8eb1b0702..bb9960542a 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -74,8 +74,8 @@ void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number) put_bits(&s->pb, 1, format); /* 0 == QCIF, 1 == CIF */ - put_bits(&s->pb, 1, 0); /* still image mode */ - put_bits(&s->pb, 1, 0); /* reserved */ + put_bits(&s->pb, 1, 1); /* still image mode */ + put_bits(&s->pb, 1, 1); /* reserved */ put_bits(&s->pb, 1, 0); /* no PEI */ if (format == 0) |