diff options
author | Austin Yuan <shengquan.yuan@gmail.com> | 2010-10-26 00:59:10 +0800 |
---|---|---|
committer | Austin Yuan <shengquan.yuan@gmail.com> | 2010-10-26 00:59:10 +0800 |
commit | dbf2fe951ed5000bea5413e349fdaf60bec33bb2 (patch) | |
tree | cdc1952515e5f8adbd92c3ca4c64cd14813f6473 | |
parent | d03c9ea3d2079e33b617367481b48d02d4f99af6 (diff) | |
parent | 319fd55aa578fdf92e4516fb856326f6bf23d4eb (diff) | |
download | libva-dbf2fe951ed5000bea5413e349fdaf60bec33bb2.tar.gz |
Merge branch 'master' of ssh://git@moblin.intel.com/umg-moorestown-libva
Conflicts:
va/va.c
va/va_trace.c
Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>
-rw-r--r-- | va/va.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -67,7 +67,11 @@ extern int trace_flag; * return 0: the "env" is set, and the value is copied into env_value * 1: the env is not set */ +<<<<<<< HEAD:va/va.c int va_parseConfig(char *env, char *env_value) +======= +int psb_parse_config(char *env, char *env_value) +>>>>>>> 319fd55aa578fdf92e4516fb856326f6bf23d4eb:va/va.c { char *token, *value, *saveptr; char oneline[1024]; |