[FFmpeg-cvslog] Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sat May  7 21:37:28 2016 +0100| [c59c7924707e2a28f2e777c2f7c284078feae967] | committer: Derek Buitenhuis

Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'

* commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f':
  intrax8: Use the generic horizband function

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

 libavcodec/intrax8.c   |    8 ++++++--
 libavcodec/intrax8.h   |    3 ++-
 libavcodec/vc1_block.c |    2 +-
 libavcodec/wmv2dec.c   |    2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index 94ef90c..ff828ee 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -30,6 +30,7 @@
 #include "intrax8huf.h"
 #include "intrax8.h"
 #include "intrax8dsp.h"
+#include "mpegutils.h"
 
 #define MAX_TABLE_DEPTH(table_bits, max_bits) \
     ((max_bits + table_bits - 1) / table_bits)
@@ -773,7 +774,8 @@ av_cold void ff_intrax8_common_end(IntraX8Context *w)
 
 int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict,
                               GetBitContext *gb, int *mb_x, int *mb_y,
-                              int dquant, int quant_offset, int loopfilter)
+                              int dquant, int quant_offset,
+                              int loopfilter, int lowdelay)
 {
     MpegEncContext *const s = w->s;
     int mb_xy;
@@ -834,7 +836,9 @@ int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict,
             w->dest[0] += 8;
         }
         if (w->mb_y & 1)
-            ff_mpeg_draw_horiz_band(s, (w->mb_y - 1) * 8, 16);
+            ff_draw_horiz_band(w->avctx, w->frame, w->frame,
+                               (w->mb_y - 1) * 8, 16,
+                               PICT_FRAME, 0, lowdelay);
     }
 
 error:
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index fd7225e..c8897fe 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -113,6 +113,7 @@ void ff_intrax8_common_end(IntraX8Context *w);
  */
 int ff_intrax8_decode_picture(IntraX8Context *w, Picture *pict,
                               GetBitContext *gb, int *mb_x, int *mb_y,
-                              int quant, int halfpq, int loopfilter);
+                              int quant, int halfpq,
+                              int loopfilter, int lowdelay);
 
 #endif /* AVCODEC_INTRAX8_H */
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c
index 5528903..96d2a9b 100644
--- a/libavcodec/vc1_block.c
+++ b/libavcodec/vc1_block.c
@@ -2934,7 +2934,7 @@ void ff_vc1_decode_blocks(VC1Context *v)
         ff_intrax8_decode_picture(&v->x8, &v->s.current_picture,
                                   &v->s.gb, &v->s.mb_x, &v->s.mb_y,
                                   2 * v->pq + v->halfpq, v->pq * !v->pquantizer,
-                                  v->s.loop_filter);
+                                  v->s.loop_filter, v->s.low_delay);
 
         ff_er_add_slice(&v->s.er, 0, 0,
                         (v->s.mb_x >> 1) - 1, (v->s.mb_y >> 1) - 1,
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 3be810c..6ee13a4 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -222,7 +222,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s)
         ff_intrax8_decode_picture(&w->x8, &s->current_picture,
                                   &s->gb, &s->mb_x, &s->mb_y,
                                   2 * s->qscale, (s->qscale - 1) | 1,
-                                  s->loop_filter);
+                                  s->loop_filter, s->low_delay);
 
         ff_er_add_slice(&w->s.er, 0, 0,
                         (w->s.mb_x >> 1) - 1, (w->s.mb_y >> 1) - 1,


======================================================================