From: Kitae Kim <kt920.kim@samsung.com>
Date: Mon, 1 Dec 2014 08:10:20 +0000 (+0900)
Subject: Merge branch 'features/brillcodec_2i' into 'tizen_next'
X-Git-Tag: TizenStudio_2.0_p3.0~398^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36f8c9f021f5f8b3534160b39f29f316c73a4e63;p=sdk%2Femulator%2Fqemu.git

Merge branch 'features/brillcodec_2i' into 'tizen_next'

Conflicts:
	configure
	package/changelog
	package/pkginfo.manifest
	target-i386/hax-all.c
	tizen/src/Makefile
	tizen/src/display/maru_display.c
	tizen/src/display/maru_sdl.c
	tizen/src/display/maru_shm.c
	tizen/src/display/maru_shm.h
	tizen/src/eventcast/encode_fb.c
	tizen/src/eventcast/encode_fb.h
	tizen/src/eventcast/touch.c
	tizen/src/eventcast/touch.h
	tizen/src/hw/pci/Makefile.objs
	tizen/src/hw/pci/maru_brillcodec.c
	tizen/src/hw/pci/maru_brillcodec.h
	tizen/src/hw/pci/maru_brillcodec_device.c
	tizen/src/tethering/Makefile.objs
	tizen/src/tethering/common.c
	tizen/src/util/new_debug_ch.c
	tizen/src/util/osutil.h
	vl.c

Change-Id: Iab1486003ec796882e52647d08518624db664cdc
---

36f8c9f021f5f8b3534160b39f29f316c73a4e63
diff --cc tizen/src/hw/pci/Makefile.objs
index 511f6ae,f816976..408a68c
--- a/tizen/src/hw/pci/Makefile.objs
+++ b/tizen/src/hw/pci/Makefile.objs
@@@ -1,10 -1,5 +1,10 @@@
- obj-y += maru_brillcodec_device.o
+ obj-$(CONFIG_LIBAV) += maru_brillcodec_device.o
+ obj-$(CONFIG_LIBAV) += maru_brillcodec.o
 +ifdef CONFIG_LINUX
 +LIBS += -ldl
 +endif
- obj-y += maru_brillcodec.o
 +obj-$(CONFIG_DXVA2) += maru_dxva2_plugin.o
 +obj-$(CONFIG_VAAPI) += maru_brillcodec_vaapi.o
  
  obj-y += maru_brightness.o
  
@@@ -25,11 -20,5 +25,11 @@@ LIBS += -framework Cocoa -framework QTK
  LIBS += -framework AppKit
  endif
  
- maru_brillcodec.o-cflags := $(LIBAV_CFLAGS)
  maru_brillcodec_device.o-cflags := $(LIBAV_CFLAGS)
+ maru_brillcodec.o-cflags := $(LIBAV_CFLAGS)
 +ifdef CONFIG_DXVA2
 +maru_dxva2_plugin.o-cflags := $(LIBAV_CFLAGS)
 +endif
 +ifdef CONFIG_VAAPI
 +maru_brillcodec_vaapi.o-cflags := $(LIBAV_CFLAGS) $(LIBVA_CFLAGS)
 +endif