Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'

* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
  intrax8: Remove mpegvideo dependency

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

diff --cc libavcodec/intrax8.c
Simple merge

diff --cc libavcodec/intrax8.h
index a28c7ca,ad172b1..5b8946e
--- 1/libavcodec/intrax8.h
--- 2/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@@ -21,10 -21,8 +21,9 @@@
  
  #include "blockdsp.h"
  #include "get_bits.h"
- #include "mpegvideo.h"
  #include "idctdsp.h"
  #include "intrax8dsp.h"
 +#include "wmv2dsp.h"
  #include "mpegpicture.h"
  
  typedef struct IntraX8Context {
@@@ -104,10 -96,6 +99,7 @@@ void ff_intrax8_common_end(IntraX8Conte
  
  /**
   * Decode single IntraX8 frame.
-  * 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 gb open bitstream reader

diff --cc libavcodec/vc1dec.c
Simple merge

diff --cc libavcodec/wmv2dec.c
Simple merge