Index: libavcodec/jpeg_ls.c
===================================================================
--- libavcodec/jpeg_ls.c        (revision 7265)
+++ libavcodec/jpeg_ls.c        (working copy)
@@ -804,9 +804,10 @@
     av_free(zero);
     av_free(state);
 
+    put_bits(&pb2, 16, 0);
     flush_put_bits(&pb2);
     /* do escape coding */
-    size = put_bits_count(&pb2) >> 3;
+    size = (put_bits_count(&pb2) >> 3) - 2;
     init_get_bits(&gb, buf2, size);
     while(get_bits_count(&gb) < size * 8){
         int v;