diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:49:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:49:20 +0200 |
| commit | edfcbf7c83cb7828c0531e788ba8c5c47b07fc5f (patch) | |
| tree | ec173fd62aa7a5e0cbdc6e729169209cbe5ec58b /libavcodec/h261enc.c | |
| parent | a137e50ee54cd902c436d15463c6e621623cc9ad (diff) | |
| parent | 02b7c630875c0bc63cee5ec597aa33baf9bf4e20 (diff) | |
Merge commit '02b7c630875c0bc63cee5ec597aa33baf9bf4e20'
* commit '02b7c630875c0bc63cee5ec597aa33baf9bf4e20':
h261: Signal freeze picture release for intra frames
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index bb9960542a..24ef577aa6 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -68,7 +68,7 @@ void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number) put_bits(&s->pb, 1, 0); /* split screen off */ put_bits(&s->pb, 1, 0); /* camera off */ - put_bits(&s->pb, 1, 0); /* freeze picture release off */ + put_bits(&s->pb, 1, s->pict_type == AV_PICTURE_TYPE_I); /* freeze picture release on/off */ format = ff_h261_get_picture_format(s->width, s->height); |