summaryrefslogtreecommitdiffstats
path: root/libhb/encx264.h
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-09-09 01:03:33 +0000
committerRodeo <[email protected]>2012-09-09 01:03:33 +0000
commitac59f6afae162450e7d3a4af8106dba75bc5b88f (patch)
tree263f2d28ba4a9f053889b6e55eff7b42acf8d050 /libhb/encx264.h
parent595c8164011910b67fe5bc4719dec7dc100d2623 (diff)
encx264: use less generic names for some stuff.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4945 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/encx264.h')
-rw-r--r--libhb/encx264.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/encx264.h b/libhb/encx264.h
index 369cc5377..e7c4b08f6 100644
--- a/libhb/encx264.h
+++ b/libhb/encx264.h
@@ -9,13 +9,13 @@
#include "x264.h"
-static const char * const h264_level_names[] = { "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2", 0 };
-static const int const h264_level_values[] = { 10, 9, 11, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41, 42, 50, 51, 52, 0 };
+static const char * const hb_h264_level_names[] = { "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2", 0 };
+static const int const hb_h264_level_values[] = { 10, 9, 11, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41, 42, 50, 51, 52, 0 };
/* x264 preferred option names (left) and synonyms (right).
* The "preferred" names match names used in x264's param2string function more
* closely than their corresponding synonyms, or are just shorter. */
-static const char * const x264_encopt_synonyms[] =
+static const char * const hb_x264_encopt_synonyms[] =
{
"deterministic", "n-deterministic",
"level", "level-idc",