Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save maki-rxrz/59fef39a49b6438b0573 to your computer and use it in GitHub Desktop.
Save maki-rxrz/59fef39a49b6438b0573 to your computer and use it in GitHub Desktop.
It is fix patch for x262. <https://github.com/kierank/x262> Target revision: r2615(r2377+238) 0e1bd31
From b560d8745b38eb549798bc57bbde14943f05881f Mon Sep 17 00:00:00 2001
From: Masaki Tanaka <maki.rxrz@gmail.com>
Date: Thu, 9 Jan 2014 21:30:25 +0900
Subject: [PATCH] Fix some mistakes of merge commits
---
common/common.c | 2 +-
configure | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/common/common.c b/common/common.c
index 4ef122a..ec310b0 100644
--- a/common/common.c
+++ b/common/common.c
@@ -1261,7 +1261,7 @@ static void x264_log_mpeg2( void *p_unused, int i_level, const char *psz_fmt, va
break;
}
fprintf( stderr, "x262 [%s]: ", psz_prefix );
- vfprintf( stderr, psz_fmt, arg );
+ x264_vfprintf( stderr, psz_fmt, arg );
}
/****************************************************************************
diff --git a/configure b/configure
index 838f7da..142a229 100755
--- a/configure
+++ b/configure
@@ -31,7 +31,6 @@ Configuration options:
--enable-win32thread use win32threads (windows only)
--disable-interlaced disable interlaced encoding support
--disable-mpeg2 disables MPEG-2 encoding support
- --enable-visualize enable visualization (X11 only)
--bit-depth=BIT_DEPTH set output bit depth (8-10) [8]
--chroma-format=FORMAT output chroma format (420, 422, 444, all) [all]
@@ -860,8 +859,6 @@ if [ "$swscale" = "auto" ] ; then
fi
fi
-
-
if [ "$lavf" = "auto" ] ; then
lavf="no"
if ${cross_prefix}pkg-config --exists libavformat libavcodec libswscale 2>/dev/null; then
@@ -1191,7 +1188,7 @@ EOF
if [ $compiler = ICL ]; then
echo '%.o: %.c' >> config.mak
- echo ' $(CC) $(CFLAGS) -c -Fo$@ $<' >> config.mak
+ echo ' $(CC) $(CFLAGS) -c -Fo$@ $<' >> config.mak
fi
if [ "$cli" = "yes" ]; then
--
1.8.5.2.msysgit.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment