[MPlayer-cvslog] r37593 - in branches/1.2: . configure cpudetect.c libmpcodecs/pullup.c libmpcodecs/vf_ass.c libmpcodecs/vf_decimate.c libmpcodecs/vf_divtc.c libmpcodecs/vf_filmdint.c libmpcodecs/vf_fspp.c libmpcod...
rtogni
subversion at mplayerhq.hu
Fri Jan 8 13:39:01 CET 2016
Author: rtogni
Date: Fri Jan 8 13:39:01 2016
New Revision: 37593
Log:
Merge r37545 and r37549 from trunk
Compile with system FFmpeg libs without a local copy of libavutil/x86/asm.h
Do not require FFmpeg to build only docs
Added:
branches/1.2/mpx86asm.h
- copied unchanged from r37545, trunk/mpx86asm.h
Modified:
branches/1.2/ (props changed)
branches/1.2/configure
branches/1.2/cpudetect.c
branches/1.2/libmpcodecs/pullup.c
branches/1.2/libmpcodecs/vf_ass.c
branches/1.2/libmpcodecs/vf_decimate.c
branches/1.2/libmpcodecs/vf_divtc.c
branches/1.2/libmpcodecs/vf_filmdint.c
branches/1.2/libmpcodecs/vf_fspp.c
branches/1.2/libmpcodecs/vf_gradfun.c
branches/1.2/libmpcodecs/vf_ilpack.c
branches/1.2/libmpcodecs/vf_ivtc.c
branches/1.2/libmpcodecs/vf_noise.c
branches/1.2/libmpcodecs/vf_tfields.c
branches/1.2/libmpcodecs/vf_yadif.c
branches/1.2/libvo/aclib_template.c
Modified: branches/1.2/configure
==============================================================================
--- branches/1.2/configure Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/configure Fri Jan 8 13:39:01 2016 (r37593)
@@ -7105,7 +7105,6 @@ fi
if test "$ffmpeg" = yes; then
test -e config.h || touch config.h
- header_check libavutil/x86/asm.h || die "libavutil/x86/asm.h header is required for shared FFmpeg"
def_ffmpeg='#define CONFIG_FFMPEG 1'
if test "$ffmpeg_a" = yes ; then
codecmodules="ffmpeg(internal) $codecmodules"
@@ -7120,9 +7119,11 @@ else
def_ffmpeg_a='#undef CONFIG_FFMPEG_A'
def_ffmpeg_so='#undef CONFIG_FFMPEG_SO'
nocodecmodules="ffmpeg $nocodecmodules"
- echo "Compiling without FFmpeg is currently not supported/working."
- echo "Please contact us if that is an issue for you."
- die "both internal and external FFmpeg missing"
+ if test "$_mplayer" = yes || test "$_mencoder" = yes ; then
+ echo "Compiling without FFmpeg is currently not supported/working."
+ echo "Please contact us if that is an issue for you."
+ die "both internal and external FFmpeg missing"
+ fi
fi
test "$_vf_lavfi" = yes && def_vf_lavfi='#define CONFIG_VF_LAVFI 1'|| libavfilters=''
test "$_libavcodec_mpegaudio_hp" = yes &&
@@ -9332,6 +9333,9 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH"
############################################################################
+# Create FFmpeg config files only for internal ffmpeg
+if test "$ffmpeg_a" = yes; then
+
# Create avconfig.h for FFmpeg.
cat > "$TMPH" << EOF
/* Generated by mpconfigure */
@@ -9376,6 +9380,8 @@ cat > ffmpeg/config.h << EOF
EOF
touch ffmpeg/.config
+fi
+
#############################################################################
cat << EOF
Modified: branches/1.2/cpudetect.c
==============================================================================
--- branches/1.2/cpudetect.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/cpudetect.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "config.h"
#include "cpudetect.h"
#include "mp_msg.h"
Modified: branches/1.2/libmpcodecs/pullup.c
==============================================================================
--- branches/1.2/libmpcodecs/pullup.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/pullup.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "config.h"
#include "pullup.h"
Modified: branches/1.2/libmpcodecs/vf_ass.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_ass.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_ass.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -46,7 +46,7 @@
#include "sub/eosd.h"
#include "cpudetect.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#define _r(c) ((c)>>24)
#define _g(c) (((c)>>16)&0xFF)
Modified: branches/1.2/libmpcodecs/vf_decimate.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_decimate.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_decimate.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -27,7 +27,7 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libvo/fastmemcpy.h"
Modified: branches/1.2/libmpcodecs/vf_divtc.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_divtc.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_divtc.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -26,7 +26,7 @@
#include "mp_msg.h"
#include "cpudetect.h"
#include "libavutil/common.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "mpbswap.h"
#include "img_format.h"
Modified: branches/1.2/libmpcodecs/vf_filmdint.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_filmdint.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_filmdint.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -30,7 +30,7 @@
#include "vd.h"
#include "vf.h"
#include "cmmx.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libvo/fastmemcpy.h"
#define NUM_STORED 4
Modified: branches/1.2/libmpcodecs/vf_fspp.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_fspp.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_fspp.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -51,7 +51,7 @@
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libavcodec/avcodec.h"
#undef free
Modified: branches/1.2/libmpcodecs/vf_gradfun.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_gradfun.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_gradfun.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -41,7 +41,7 @@
#include "libavutil/avutil.h"
#include "libavutil/common.h"
#include "libavutil/mem.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
struct vf_priv_s {
int thresh;
Modified: branches/1.2/libmpcodecs/vf_ilpack.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_ilpack.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_ilpack.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -29,7 +29,7 @@
#include "mp_image.h"
#include "vf.h"
#include "libavutil/attributes.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
typedef void (pack_func_t)(unsigned char *dst, unsigned char *y,
unsigned char *u, unsigned char *v, int w, int us, int vs);
Modified: branches/1.2/libmpcodecs/vf_ivtc.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_ivtc.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_ivtc.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -27,7 +27,7 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libvo/fastmemcpy.h"
Modified: branches/1.2/libmpcodecs/vf_noise.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_noise.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_noise.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -37,7 +37,7 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
#include "libavutil/mem.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#define MAX_NOISE 4096
#define MAX_SHIFT 1024
Modified: branches/1.2/libmpcodecs/vf_tfields.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_tfields.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_tfields.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -27,7 +27,7 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#include "libmpdemux/demuxer.h"
#include "libvo/fastmemcpy.h"
Modified: branches/1.2/libmpcodecs/vf_yadif.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_yadif.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libmpcodecs/vf_yadif.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -34,7 +34,7 @@
#include "libmpdemux/demuxer.h"
#include "libvo/fastmemcpy.h"
#include "libavutil/common.h"
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
//===========================================================================//
Modified: branches/1.2/libvo/aclib_template.c
==============================================================================
--- branches/1.2/libvo/aclib_template.c Fri Jan 8 13:34:16 2016 (r37592)
+++ branches/1.2/libvo/aclib_template.c Fri Jan 8 13:39:01 2016 (r37593)
@@ -80,7 +80,7 @@ If you have questions please contact wit
// 3dnow memcpy support from kernel 2.4.2
// by Pontscho/fresh!mindworkz
-#include "libavutil/x86/asm.h"
+#include "mpx86asm.h"
#undef HAVE_ONLY_MMX1
#if HAVE_MMX && !HAVE_MMX2 && !HAVE_AMD3DNOW && !HAVE_SSE
More information about the MPlayer-cvslog
mailing list