[FFmpeg-cvslog] Merge commit '159323897f545e7405fb9db234e0ba123e174376'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 24 12:36:23 2016 +0100| [896fce85096622b29c0312f4aa450f879d44f3cc] | committer: Derek Buitenhuis

Merge commit '159323897f545e7405fb9db234e0ba123e174376'

* commit '159323897f545e7405fb9db234e0ba123e174376':
  intrax8: Add a local BlockDSPContext and initialize it

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

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

 configure            |    2 +-
 libavcodec/intrax8.c |    3 ++-
 libavcodec/intrax8.h |    2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 1f5788b..ef0b689 100755
--- a/configure
+++ b/configure
@@ -2261,7 +2261,7 @@ faandct_deps="faan fdctdsp"
 faanidct_deps="faan idctdsp"
 h264dsp_select="startcode"
 frame_thread_encoder_deps="encoders threads"
-intrax8_select="idctdsp"
+intrax8_select="blockdsp idctdsp"
 mdct_select="fft"
 me_cmp_select="fdctdsp idctdsp pixblockdsp"
 mpeg_er_select="error_resilience"
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index a4aaad6..f6131ee 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -583,7 +583,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
     int sign;
 
     av_assert2(w->orient < 12);
-    s->bdsp.clear_block(s->block[0]);
+    w->bdsp.clear_block(s->block[0]);
 
     if (chroma)
         dc_mode = 2;
@@ -763,6 +763,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
                       ff_wmv1_scantable[3]);
 
     ff_intrax8dsp_init(&w->dsp);
+    ff_blockdsp_init(&w->bdsp, avctx);
 
     return 0;
 }
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index af19582..ed3dcc6 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -19,6 +19,7 @@
 #ifndef AVCODEC_INTRAX8_H
 #define AVCODEC_INTRAX8_H
 
+#include "blockdsp.h"
 #include "get_bits.h"
 #include "mpegvideo.h"
 #include "idctdsp.h"
@@ -44,6 +45,7 @@ typedef struct IntraX8Context {
     MpegEncContext * s;
     IntraX8DSPContext dsp;
     IDCTDSPContext idsp;
+    BlockDSPContext bdsp;
     int quant;
     int dquant;
     int qsum;


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

diff --cc configure
index 1f5788b,e5f5046..ef0b689
--- a/configure
+++ b/configure
@@@ -2260,9 -1863,9 +2260,9 @@@ error_resilience_select="me_cmp
  faandct_deps="faan fdctdsp"
  faanidct_deps="faan idctdsp"
  h264dsp_select="startcode"
 +frame_thread_encoder_deps="encoders threads"
- intrax8_select="idctdsp"
+ intrax8_select="blockdsp idctdsp"
  mdct_select="fft"
 -rdft_select="fft"
  me_cmp_select="fdctdsp idctdsp pixblockdsp"
  mpeg_er_select="error_resilience"
  mpegaudio_select="mpegaudiodsp"
diff --cc libavcodec/intrax8.c
index a4aaad6,e7eda24..f6131ee
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@@ -582,8 -586,8 +582,8 @@@ static int x8_decode_intra_mb(IntraX8Co
      int use_quant_matrix;
      int sign;
  
 -    assert(w->orient < 12);
 +    av_assert2(w->orient < 12);
-     s->bdsp.clear_block(s->block[0]);
+     w->bdsp.clear_block(s->block[0]);
  
      if (chroma)
          dc_mode = 2;
diff --cc libavcodec/intrax8.h
index af19582,44954e1..ed3dcc6
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@@ -36,14 -36,13 +37,15 @@@ typedef struct IntraX8Context 
      // set by ff_intrax8_common_init
      uint8_t *prediction_table; // 2 * (mb_w * 2)
      ScanTable scantable[3];
 +    WMV2DSPContext wdsp;
 +    uint8_t idct_permutation[64];
      AVCodecContext *avctx;
  
 -    // set by the caller codec
 -    MpegEncContext *s;
 +    //set by the caller codec
 +    MpegEncContext * s;
      IntraX8DSPContext dsp;
      IDCTDSPContext idsp;
+     BlockDSPContext bdsp;
      int quant;
      int dquant;
      int qsum;