diff options
| author | Rodeo <[email protected]> | 2013-07-21 22:57:15 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-07-21 22:57:15 +0000 |
| commit | 19108e773a915ad047d99315086cdaafb335c392 (patch) | |
| tree | 5b1e247505a1f6ae0fded9fee00441f785de4c1f /contrib/x264/A00-version-string.patch | |
| parent | a3d27b2e6c41d8d856b935bf55f85c719a850cc3 (diff) | |
Bump x264 to r2345-f0c1c53.
Miscellaneous fixes and improvements as usual, plus lets us drop a patch that has now been pushed upstream.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5656 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/x264/A00-version-string.patch')
| -rw-r--r-- | contrib/x264/A00-version-string.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch index 49a652256..6610bd1a6 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 e5a1600..f635d9e 100644 +index b88f510..7dd0891 100644 --- a/x264.h +++ b/x264.h @@ -41,7 +41,17 @@ #include "x264_config.h" --#define X264_BUILD 133 +-#define X264_BUILD 135 +/* + * Define the full version explicitly so that it survives a git --archive. + * @@ -16,8 +16,8 @@ index e5a1600..f635d9e 100644 +#ifdef X264_VERSION +#undef X264_VERSION +#endif -+#define X264_BUILD 133 -+#define X264_VERSION " r2334 a3ac64b" ++#define X264_BUILD 135 ++#define X264_VERSION " r2345 f0c1c53" /* Application developers planning to link against a shared library version of * libx264 from a Microsoft Visual Studio or similar development environment |