ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Sun Jun 26 15:53:00 2016 +0200| [c142dc203e2590ef0addda30afafb5ce41a13a96] | committer: Hendrik Leppkes
Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50' * commit 'dc40a70c5755bccfb1a1349639943e1f408bea50': Drop unnecessary libavutil/x86/asm.h #includes Merged-by: Hendrik Leppkes <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c142dc203e2590ef0addda30afafb5ce41a13a96 --- libavcodec/msmpeg4dec.c | 1 - libavcodec/x86/audiodsp_init.c | 1 - libavcodec/x86/fmtconvert_init.c | 1 - libavcodec/x86/hpeldsp_init.c | 1 - libavcodec/x86/mpegvideodsp.c | 1 - libavcodec/x86/rv34dsp_init.c | 1 - libavcodec/x86/vp6dsp_init.c | 1 - libavcodec/x86/vp8dsp_init.c | 1 - libavfilter/x86/vf_gradfun_init.c | 1 - libavfilter/x86/vf_interlace_init.c | 1 - libavfilter/x86/vf_yadif_init.c | 1 - libswscale/x86/rgb2rgb.c | 1 - libswscale/x86/swscale.c | 1 - 13 files changed, 13 deletions(-) diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 35aa15c..2f90877 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -28,7 +28,6 @@ #include "mpegvideo.h" #include "msmpeg4.h" #include "libavutil/imgutils.h" -#include "libavutil/x86/asm.h" #include "h263.h" #include "mpeg4video.h" #include "msmpeg4data.h" diff --git a/libavcodec/x86/audiodsp_init.c b/libavcodec/x86/audiodsp_init.c index a2ce231..8f9e604 100644 --- a/libavcodec/x86/audiodsp_init.c +++ b/libavcodec/x86/audiodsp_init.c @@ -21,7 +21,6 @@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/audiodsp.h" diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c index e4cbadc..6d35377 100644 --- a/libavcodec/x86/fmtconvert_init.c +++ b/libavcodec/x86/fmtconvert_init.c @@ -24,7 +24,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/fmtconvert.h" diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index 5c5da28..f1ba4be 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -24,7 +24,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/hpeldsp.h" diff --git a/libavcodec/x86/mpegvideodsp.c b/libavcodec/x86/mpegvideodsp.c index 941a8e2..e0498f3 100644 --- a/libavcodec/x86/mpegvideodsp.c +++ b/libavcodec/x86/mpegvideodsp.c @@ -19,7 +19,6 @@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/mpegvideodsp.h" #include "libavcodec/videodsp.h" diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c index 99c56f9..d417dac 100644 --- a/libavcodec/x86/rv34dsp_init.c +++ b/libavcodec/x86/rv34dsp_init.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/rv34dsp.h" diff --git a/libavcodec/x86/vp6dsp_init.c b/libavcodec/x86/vp6dsp_init.c index 82baee7..81d371d 100644 --- a/libavcodec/x86/vp6dsp_init.c +++ b/libavcodec/x86/vp6dsp_init.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vp56dsp.h" diff --git a/libavcodec/x86/vp8dsp_init.c b/libavcodec/x86/vp8dsp_init.c index 8d5d033..897d5a0 100644 --- a/libavcodec/x86/vp8dsp_init.c +++ b/libavcodec/x86/vp8dsp_init.c @@ -23,7 +23,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vp8dsp.h" diff --git a/libavfilter/x86/vf_gradfun_init.c b/libavfilter/x86/vf_gradfun_init.c index c638a05..3f51562 100644 --- a/libavfilter/x86/vf_gradfun_init.c +++ b/libavfilter/x86/vf_gradfun_init.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/gradfun.h" diff --git a/libavfilter/x86/vf_interlace_init.c b/libavfilter/x86/vf_interlace_init.c index 68ee47d..52a22f8 100644 --- a/libavfilter/x86/vf_interlace_init.c +++ b/libavfilter/x86/vf_interlace_init.c @@ -22,7 +22,6 @@ #include "libavutil/cpu.h" #include "libavutil/internal.h" #include "libavutil/mem.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/interlace.h" diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index c36a2d0..c39bc44 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/yadif.h" diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index b80e869..ffd12e1 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -27,7 +27,6 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavutil/cpu.h" #include "libavutil/bswap.h" diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 3b370be..7356692 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -25,7 +25,6 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" -#include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavutil/cpu.h" #include "libavutil/pixdesc.h" ====================================================================== diff --cc libavcodec/msmpeg4dec.c index 35aa15c,7c22b37..2f90877 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@@ -27,8 -27,6 +27,7 @@@ #include "mpegutils.h" #include "mpegvideo.h" #include "msmpeg4.h" +#include "libavutil/imgutils.h" - #include "libavutil/x86/asm.h" #include "h263.h" #include "mpeg4video.h" #include "msmpeg4data.h" diff --cc libavcodec/x86/audiodsp_init.c index a2ce231,8eb2e56..8f9e604 --- a/libavcodec/x86/audiodsp_init.c +++ b/libavcodec/x86/audiodsp_init.c @@@ -21,9 -21,9 +21,8 @@@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" - #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/audiodsp.h" -#include "audiodsp.h" int32_t ff_scalarproduct_int16_mmxext(const int16_t *v1, const int16_t *v2, int order); diff --cc libavcodec/x86/mpegvideodsp.c index 941a8e2,b701ef8..e0498f3 --- a/libavcodec/x86/mpegvideodsp.c +++ b/libavcodec/x86/mpegvideodsp.c @@@ -19,10 -19,8 +19,9 @@@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" - #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/mpegvideodsp.h" +#include "libavcodec/videodsp.h" #if HAVE_INLINE_ASM diff --cc libavfilter/x86/vf_yadif_init.c index c36a2d0,863e7df..c39bc44 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@@ -20,8 -20,8 +20,7 @@@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/internal.h" #include "libavutil/mem.h" - #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/yadif.h" diff --cc libswscale/x86/swscale.c index 3b370be,ec77467..7356692 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@@ -23,9 -23,7 +23,8 @@@ #include "libswscale/swscale.h" #include "libswscale/swscale_internal.h" #include "libavutil/attributes.h" +#include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" - #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavutil/cpu.h" #include "libavutil/pixdesc.h" _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
