mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'
* commit 'a5a71992cae34b321ceb8374f44ce17a945a3881': mpeg4videoenc: don't set MpegEncContext.resync_marker Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
26b526e776
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user