Minor changes

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

7 files changed, 11 insertions, 57 deletions

diff --git a/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp b/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp
index 6849a80a7..552371fe6 100644
--- a/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp
+++ b/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp
@@ -31,9 +31,10 @@
 #ifdef REGISTER_FILTER

 

 

+// Workaround: graphedit crashes when a filter exposes more than 115 input MediaTypes!

 const AMOVIESETUP_PIN sudpPinsVideoDec[] =

 {

-	{L"Input", FALSE, FALSE, FALSE, FALSE, &CLSID_NULL, NULL, CMPCVideoDecFilter::sudPinTypesInCount,  CMPCVideoDecFilter::sudPinTypesIn},

+	{L"Input", FALSE, FALSE, FALSE, FALSE, &CLSID_NULL, NULL, CMPCVideoDecFilter::sudPinTypesInCount > 115 ? 115 : CMPCVideoDecFilter::sudPinTypesInCount,  CMPCVideoDecFilter::sudPinTypesIn},

     {L"Output", FALSE, TRUE, FALSE, FALSE, &CLSID_NULL, NULL, CMPCVideoDecFilter::sudPinTypesOutCount, CMPCVideoDecFilter::sudPinTypesOut}

 };

 

diff --git a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp
index 96af24764..af1126c62 100644
--- a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp
+++ b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp
@@ -433,8 +433,7 @@ const AMOVIESETUP_MEDIATYPE CMPCVideoDecFilter::sudPinTypesIn[] =
 	{ &MEDIATYPE_Video, &MEDIASUBTYPE_wv1f   }

 };

 

-// Workaround : graphedit crash when filter expose more than 115 input MediaTypes !

-const int CMPCVideoDecFilter::sudPinTypesInCount = 115; //countof(CMPCVideoDecFilter::sudPinTypesIn);

+const int CMPCVideoDecFilter::sudPinTypesInCount = countof(CMPCVideoDecFilter::sudPinTypesIn);

 

 UINT       CMPCVideoDecFilter::FFmpegFilters = 0xFFFFFFFF;

 UINT       CMPCVideoDecFilter::DXVAFilters = 0xFFFFFFFF;

diff --git a/src/filters/transform/mpcvideodec/ffmpeg/Makefile b/src/filters/transform/mpcvideodec/ffmpeg/Makefile
index 360b365bb..49b802de6 100644
--- a/src/filters/transform/mpcvideodec/ffmpeg/Makefile
+++ b/src/filters/transform/mpcvideodec/ffmpeg/Makefile
@@ -161,7 +161,7 @@ OPTFLAGS+= -fno-math-errno
 .all: $(SLIB)

 

 clean:

-	rm -f *.o *.d *~ $(LAVC_DIR)/*.o $(LAVC_DIR)/*.d $(LAVC_DIR)/x86/*.o $(LAVC_DIR)/amrnb/*.o $(LAVC_DIR)/amrwb/*.o $(LAVF_DIR)/*.o $(LAVF_DIR)/*.d $(LAVU_DIR)/*.o $(LAVU_DIR)/*.d $(SLIB) $(ZLIB_DIR)/*.o $(PNG_DIR)/*.o $(LAVC_DIR)/x86/*.d $(LAVC_DIR)/amr_float/*.d $(ZLIB_DIR)/*.d

+	rm -f *.o *.d *~ $(LAVC_DIR)/*.o $(LAVC_DIR)/*.d $(LAVC_DIR)/x86/*.o $(LAVC_DIR)/amrnb/*.o $(LAVC_DIR)/amrwb/*.o $(LAVU_DIR)/*.o $(LAVU_DIR)/*.d $(SLIB) $(ZLIB_DIR)/*.o $(PNG_DIR)/*.o $(LAVC_DIR)/x86/*.d $(LAVC_DIR)/amrnb/*.d $(LAVC_DIR)/amrwb/*.d $(ZLIB_DIR)/*.d

 

 #

 # include dependency files if they exist

diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.def b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.def
index f4c10b886..6a334e2ed 100644
--- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.def
+++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.def
@@ -2,14 +2,11 @@ EXPORTS
   avcodec_init

   avcodec_register_all

   avcodec_find_decoder

-  avcodec_find_encoder

   avcodec_open

   avcodec_alloc_context

   avcodec_alloc_frame

   avcodec_decode_video

-  avcodec_encode_video

   avcodec_decode_audio2

-  avcodec_encode_audio

   avcodec_flush_buffers

   avcodec_close

   getVersion

diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/avcodec.h b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/avcodec.h
index 9202f1d24..65b692dd2 100644
--- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/avcodec.h
+++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/avcodec.h
@@ -2426,8 +2426,7 @@ FF_EXPORT int avcodec_thread_init(AVCodecContext *s, int thread_count);
 FF_EXPORT void avcodec_thread_free(AVCodecContext *s);

 int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);

 int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);

-const char* avcodec_get_current_idct(AVCodecContext *avctx);

-void avcodec_get_encoder_info(AVCodecContext *avctx,int *xvid_build,int *divx_version,int *divx_build,int *lavc_build);

+

 //FIXME func typedef

 

 /**

diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/dsputil.c b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/dsputil.c
index 6a8164f8e..945cd5f65 100644
--- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/dsputil.c
+++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/dsputil.c
@@ -31,7 +31,7 @@
 #include "dsputil.h"

 #include "simple_idct.h"

 #include "faandct.h"

-#include "faanidct.h"

+//#include "faanidct.h"

 #include "mathops.h"

 #include "h263.h"

 

@@ -4243,11 +4243,11 @@ void attribute_align_arg dsputil_init(DSPContext* c, AVCodecContext *avctx)
             c->idct_add= ff_wmv2_idct_add_c;

             c->idct    = ff_wmv2_idct_c;

             c->idct_permutation_type= FF_NO_IDCT_PERM;

-        }else if(avctx->idct_algo==FF_IDCT_FAAN){

-            c->idct_put= ff_faanidct_put;

-            c->idct_add= ff_faanidct_add;

-            c->idct    = ff_faanidct;

-            c->idct_permutation_type= FF_NO_IDCT_PERM;

+//        }else if(avctx->idct_algo==FF_IDCT_FAAN){

+//            c->idct_put= ff_faanidct_put;

+//            c->idct_add= ff_faanidct_add;

+//            c->idct    = ff_faanidct;

+//            c->idct_permutation_type= FF_NO_IDCT_PERM;

         }else{ //accurate/default

             c->idct_put= ff_simple_idct_put;

             c->idct_add= ff_simple_idct_add;

@@ -4579,43 +4579,3 @@ void attribute_align_arg dsputil_init(DSPContext* c, AVCodecContext *avctx)
         av_log(avctx, AV_LOG_ERROR, "Internal error, IDCT permutation not set\n");

     }

 }

-

-// avcodec_get_current_idct,avcodec_get_encoder_info by h.yamagata

-// It's caller's responsibility to check avctx->priv_data is MpegEncContext*.

-const char* avcodec_get_current_idct(AVCodecContext *avctx)

-{

-    MpegEncContext *s = avctx->priv_data;

-    DSPContext *c = &s->dsp;

-

-    if (c->idct_put==ff_jref_idct_put)

-        return "Integer (ff_jref_idct)";

-    if (c->idct_put==ff_jref_idct1_put)

-        return "Integer (ff_jref_idct1)";

-    if (c->idct_put==ff_jref_idct1_put)

-        return "Integer (ff_jref_idct2)";

-    if (c->idct_put==ff_jref_idct4_put)

-        return "Integer (ff_jref_idct4)";

-    if (c->idct_put==ff_h264_lowres_idct_put_c)

-        return "H.264 (ff_h264_lowres_idct_c)";

-    if (c->idct_put==ff_vp3_idct_put_c)

-        return "VP3 (ff_vp3_idct_c)";

-    if (c->idct_put==ff_faanidct_put)

-        return "FAAN (ff_faanidct_put)";

-    if (c->idct_put==ff_simple_idct_put)

-        return "Simple IDCT (simple_idct)";

-#if HAVE_MMX

-    return avcodec_get_current_idct_mmx(avctx,c);

-#else

-	return "";

-#endif

-}

-

-// It's caller's responsibility to check avctx->priv_data is MpegEncContext*.

-void avcodec_get_encoder_info(AVCodecContext *avctx,int *xvid_build,int *divx_version,int *divx_build,int *lavc_build)

-{

-    MpegEncContext *s = avctx->priv_data;

-    *xvid_build = s->xvid_build;

-    *divx_version = s->divx_version;

-    *divx_build = s->divx_build;

-    *lavc_build = s->lavc_build;

-}

diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/dsputil.h b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/dsputil.h
index dfdaee68b..daf70f4c1 100644
--- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/dsputil.h
+++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/dsputil.h
@@ -843,6 +843,4 @@ static inline void copy_block17(uint8_t *dst, const uint8_t *src, int dstStride,
     }

 }

 

-const char* avcodec_get_current_idct_mmx(AVCodecContext *avctx,DSPContext *c);

-

 #endif /* AVCODEC_DSPUTIL_H */