[FFmpeg-cvslog] mpeg4videoenc: don't set MpegEncContext.resync_marker

Anton Khirnov git at videolan.org
Sat Nov 30 00:48:35 CET 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Nov 26 12:14:13 2013 +0100| [a5a71992cae34b321ceb8374f44ce17a945a3881] | committer: Anton Khirnov

mpeg4videoenc: don't set MpegEncContext.resync_marker

It is only used in one place immediately after it is set.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5a71992cae34b321ceb8374f44ce17a945a3881
---

 libavcodec/mpeg4videoenc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index 14c9f65..0063f58 100644
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -1054,8 +1054,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 */



More information about the ffmpeg-cvslog mailing list