Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:32:38 +0000 (12:32 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:32:38 +0000 (12:32 +0100)
* commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64':
  intrax8: Pass the output frame to the decoding function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/intrax8.c
libavcodec/intrax8.h
libavcodec/vc1_block.c
libavcodec/wmv2dec.c

@@@ -697,11 -701,11 +697,11 @@@ static int x8_decode_intra_mb(IntraX8Co
      } else {
          w->dsp.spatial_compensation[w->orient](s->sc.edge_emu_buffer,
                                                 w->dest[chroma],
-                                                s->current_picture.f->linesize[!!chroma]);
+                                                w->frame->linesize[!!chroma]);
      }
      if (!zeros_only)
 -        w->idsp.idct_add(w->dest[chroma],
 +        w->wdsp.idct_add(w->dest[chroma],
-                          s->current_picture.f->linesize[!!chroma],
+                          w->frame->linesize[!!chroma],
                           s->block[0]);
  
  block_placed:
@@@ -23,7 -23,7 +23,8 @@@
  #include "mpegvideo.h"
  #include "idctdsp.h"
  #include "intrax8dsp.h"
 +#include "wmv2dsp.h"
+ #include "mpegpicture.h"
  
  typedef struct IntraX8Context {
      VLC *j_ac_vlc[4]; // they point to the static j_mb_vlc
@@@ -86,8 -85,8 +88,9 @@@ void ff_intrax8_common_end(IntraX8Conte
   * The parent codec must call ff_mpv_frame_start() before calling this function.
   * The parent codec must call ff_mpv_frame_end() after calling this function.
   * This function does not use ff_mpv_decode_mb().
 + * lowres decoding is theoretically impossible.
   * @param w pointer to IntraX8Context
+  * @param pict the output Picture containing an AVFrame
   * @param dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1.
   * @param quant_offset offset away from zero
   * @param loopfilter enable filter after decoding a block
Simple merge
Simple merge