Updated FFmpeg

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1792 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 2 insertions, 4 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c
index c38c494c1..65338e39d 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c
@@ -29,6 +29,7 @@
 #include "dsputil.h"

 #include "avcodec.h"

 #include "mpegvideo.h"

+#include "h263.h"

 #include "vc1.h"

 #include "vc1data.h"

 #include "vc1acdata.h"

@@ -36,7 +37,6 @@
 #include "unary.h"

 #include "simple_idct.h"

 #include "mathops.h"

-#include "h263.h"

 

 #undef NDEBUG

 #include <assert.h>

@@ -2992,11 +2992,9 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
         avctx->idct_algo=FF_IDCT_WMV2;

     }

 

-    if(ff_h263_decode_init(avctx) < 0)

+    if(ff_msmpeg4_decode_init(avctx) < 0)

         return -1;

     if (vc1_init_common(v) < 0) return -1;

-    // only for ff_msmp4_mb_i_table

-    if (ff_msmpeg4_decode_init(avctx) < 0) return -1;

 

     avctx->coded_width = avctx->width;

     avctx->coded_height = avctx->height;