Merge commit '6d4d3fee63c46d921c4870feab79269af94e84e1'

[ffmpeg] / libavcodec / mqcenc.c

diff --git a/libavcodec/mqcenc.c b/libavcodec/mqcenc.c
index 97d352be4484b196e952014b449eaa80739aef47..7c9e1a0df961bdaa3ce08020bb88eeee39c7467b 100644 (file)
--- a/libavcodec/mqcenc.c
+++ b/libavcodec/mqcenc.c
@@ -25,6 +25,7 @@
  * @author Kamil Nowosad
  */
 
+#include "libavutil/avassert.h"
 #include "mqc.h"
 
 static void byteout(MqcState *mqc)
@@ -117,3 +118,22 @@ int ff_mqc_flush(MqcState *mqc)
         mqc->bp++;
     return mqc->bp - mqc->bpstart;
 }
+
+int ff_mqc_flush_to(MqcState *mqc, uint8_t *dst, int *dst_len)
+{
+    MqcState mqc2 = *mqc;
+    mqc2.bpstart=
+    mqc2.bp = dst;
+    *mqc2.bp = *mqc->bp;
+    ff_mqc_flush(&mqc2);
+    *dst_len = mqc2.bp - dst;
+    if (mqc->bp < mqc->bpstart) {
+        av_assert1(mqc->bpstart - mqc->bp == 1);
+        av_assert1(*dst_len > 0);
+        av_assert1(mqc->bp[0] == 0 && dst[0] == 0);
+        (*dst_len) --;
+        memmove(dst, dst+1, *dst_len);
+        return mqc->bp - mqc->bpstart + 1 + *dst_len;
+    }
+    return mqc->bp - mqc->bpstart + *dst_len;
+}