avcodec, avfilter, avformat: Remove redundant avpriv_align_put_bits

flush_put_bits() already fills the bitstream with zeroes, so it is
unnecessary to align the bitstream before.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>

diff --git a/libavcodec/hevc_ps_enc.c b/libavcodec/hevc_ps_enc.c
index 78a73a5c0ae8e39835ba5294bc021bac5613b940..5449f81c826eb983ab65a005b5c51023e21d2489 100644 (file)
--- a/libavcodec/hevc_ps_enc.c
+++ b/libavcodec/hevc_ps_enc.c
@@ -113,10 +113,9 @@ int ff_hevc_encode_nal_vps(HEVCVPS *vps, unsigned int id,
     put_bits(&pb, 1, 0);    // extension flag
 
     put_bits(&pb, 1, 1);    // stop bit
-    avpriv_align_put_bits(&pb);
+    flush_put_bits(&pb);
 
     data_size = put_bits_count(&pb) / 8;
-    flush_put_bits(&pb);
 
     return data_size;
 }

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 21c30a9f8acd6b44b7ff5676c8aed0d94a929b6c..09697d89c81b2c8b3da03cdb5c23149e55d2eb96 100644 (file)
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -2818,7 +2818,6 @@ static void write_slice_end(MpegEncContext *s){
         ff_mjpeg_encode_stuffing(s);
     }
 
-    avpriv_align_put_bits(&s->pb);
     flush_put_bits(&s->pb);
 
     if ((s->avctx->flags & AV_CODEC_FLAG_PASS1) && !s->partitioned_frame)

diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c
index ba5a03e4ec7e5c8eb35112f4d3e8069f83c8ea83..2efb0f70ade228f057ac75be7a19cef3759428dc 100644 (file)
--- a/libavcodec/vc2enc.c
+++ b/libavcodec/vc2enc.c
@@ -780,7 +780,6 @@ static int encode_slices(VC2EncContext *s)
     int slice_x, slice_y, skip = 0;
     SliceArgs *enc_args = s->slice_args;
 
-    avpriv_align_put_bits(&s->pb);
     flush_put_bits(&s->pb);
     buf = put_bits_ptr(&s->pb);
 

diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c
index 4d58e0f3b589ec599e63fa8a3937dcf3810d488e..349c1bca3c6ee1d2595cb6dfd101332520a54bdb 100644 (file)
--- a/libavcodec/xsubenc.c
+++ b/libavcodec/xsubenc.c
@@ -206,7 +206,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
     // Enforce total height to be a multiple of 2
     if (h->rects[0]->h & 1) {
         put_xsub_rle(&pb, h->rects[0]->w, PADDING_COLOR);
-        avpriv_align_put_bits(&pb);
     }
 
     flush_put_bits(&pb);

diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c
index d07b213f3125a0b5689393a6351586b543a92bd7..5ea55d52470cf73a42c38291f6636e783a9e75a4 100644 (file)
--- a/libavfilter/vf_signature.c
+++ b/libavfilter/vf_signature.c
@@ -559,7 +559,6 @@ static int binary_export(AVFilterContext *ctx, StreamContext *sc, const char* fi
         }
     }
 
-    avpriv_align_put_bits(&buf);
     flush_put_bits(&buf);
     fwrite(buffer, 1, put_bits_count(&buf)/8, f);
     fclose(f);

diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index 72b7f72f22c510b0c078271bd18c3ccd84bfc32e..5458ce2596ba08481a7cbe0889fad8801955bd22 100644 (file)
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -211,7 +211,6 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt)
     } else
         avpriv_copy_bits(&bs, pkt->data, 8*pkt->size);
 
-    avpriv_align_put_bits(&bs);
     flush_put_bits(&bs);
 
     len = put_bits_count(&bs) >> 3;