diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:53:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:55:00 +0100 |
| commit | 26b526e776a4ee7b88775f12c75b0a87fcc0e8e4 (patch) | |
| tree | f736f167b26a1e4da7a949bc7c41a6140d52c6c3 /libavcodec/mpeg4videoenc.c | |
| parent | f5d6541ba0d279955a2df798646e30370d85458a (diff) | |
| parent | a5a71992cae34b321ceb8374f44ce17a945a3881 (diff) | |
| download | ffmpeg-streaming-26b526e776a4ee7b88775f12c75b0a87fcc0e8e4.zip ffmpeg-streaming-26b526e776a4ee7b88775f12c75b0a87fcc0e8e4.tar.gz | |
Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'
* commit 'a5a71992cae34b321ceb8374f44ce17a945a3881':
mpeg4videoenc: don't set MpegEncContext.resync_marker
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videoenc.c')
| -rw-r--r-- | libavcodec/mpeg4videoenc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 993cb49..14c6e8f 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1063,8 +1063,7 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, if (vo_ver_id != 1) put_bits(&s->pb, 1, s->quarter_sample); put_bits(&s->pb, 1, 1); /* complexity estimation disable */ - s->resync_marker = s->rtp_mode; - put_bits(&s->pb, 1, s->resync_marker ? 0 : 1); /* resync marker disable */ + put_bits(&s->pb, 1, s->rtp_mode ? 0 : 1); /* resync marker disable */ put_bits(&s->pb, 1, s->data_partitioning ? 1 : 0); if (s->data_partitioning) put_bits(&s->pb, 1, 0); /* no rvlc */ |
