diff options
| author | Rodeo <[email protected]> | 2013-09-25 17:40:24 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-09-25 17:40:24 +0000 |
| commit | 32e6e8afbafefac703524538b760d5bb35a85300 (patch) | |
| tree | 14a94a04768b2f366b0324c858835ac4e98bcb0c /contrib/x264 | |
| parent | 5060ac05b42561f5689e0aa543331f1308fa3597 (diff) | |
Bump libx264 to r2358 9e941d1.
Miscellaneous fixes and improvements.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5814 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/x264')
| -rw-r--r-- | contrib/x264/A00-version-string.patch | 8 | ||||
| -rw-r--r-- | contrib/x264/module.defs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch index 6610bd1a6..11b4d2c67 100644 --- a/contrib/x264/A00-version-string.patch +++ b/contrib/x264/A00-version-string.patch @@ -1,12 +1,12 @@ diff --git a/x264.h b/x264.h -index b88f510..7dd0891 100644 +index 69dce07..044705c 100644 --- a/x264.h +++ b/x264.h @@ -41,7 +41,17 @@ #include "x264_config.h" --#define X264_BUILD 135 +-#define X264_BUILD 138 +/* + * Define the full version explicitly so that it survives a git --archive. + * @@ -16,8 +16,8 @@ index b88f510..7dd0891 100644 +#ifdef X264_VERSION +#undef X264_VERSION +#endif -+#define X264_BUILD 135 -+#define X264_VERSION " r2345 f0c1c53" ++#define X264_BUILD 138 ++#define X264_VERSION " r2358 9e941d1" /* Application developers planning to link against a shared library version of * libx264 from a Microsoft Visual Studio or similar development environment diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs index 876dc6462..2b5b744ab 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32)) $(eval $(call import.CONTRIB.defs,X264)) -X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2345-f0c1c53.tar.gz +X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2358-9e941d1.tar.gz X264.EXTRACT.tarbase = x264 X264.CONFIGURE.deps = |