Merge commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec'

[ffmpeg] / libavcodec / dcaenc.c

diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index 92b8b1ff257f3a971ffe7bd7fbefc53416b41fe2..23587a7bd7da151aaac1aae1fe82d2dafe5fb642 100644 (file)
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -938,6 +938,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     for (i = 0; i < SUBFRAMES; i++)
         put_subframe(c, i);
 
+
+    for (i = put_bits_count(&c->pb); i < 8*c->frame_size; i++)
+        put_bits(&c->pb, 1, 0);
+
     flush_put_bits(&c->pb);
 
     avpkt->pts      = frame->pts;
@@ -960,7 +964,7 @@ AVCodec ff_dca_encoder = {
     .priv_data_size        = sizeof(DCAEncContext),
     .init                  = encode_init,
     .encode2               = encode_frame,
-    .capabilities          = CODEC_CAP_EXPERIMENTAL,
+    .capabilities          = AV_CODEC_CAP_EXPERIMENTAL,
     .sample_fmts           = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32,
                                                             AV_SAMPLE_FMT_NONE },
     .supported_samplerates = sample_rates,