Merge branch 'gwe_master' into 1.0
authorSreerenj Balachandran <sreerenj.balachandran@intel.com>
Mon, 5 Nov 2012 15:41:43 +0000 (17:41 +0200)
committerSreerenj Balachandran <sreerenj.balachandran@intel.com>
Mon, 5 Nov 2012 15:41:43 +0000 (17:41 +0200)
commitb59630532fd79b02b3ecfb1f80cb90f40231558d
treeeff745afba65519addaf15b6c900cac985e6a1cd
parentc7c7474383cc214d10b2f72d517e96160bbb1a31
parentafddf11e22c485a29d05e78448d8204581d77d8c
Merge branch 'gwe_master' into 1.0

Conflicts:
Makefile.am
gst-libs/gst/vaapi/gstvaapidecoder.c
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
gst/vaapi/gstvaapidecode.c
gst/vaapi/gstvaapidecode.h
Makefile.am
configure.ac
gst-libs/gst/vaapi/Makefile.am
gst-libs/gst/vaapi/gstvaapidecoder.c
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
gst-libs/gst/vaapi/gstvaapidecoder_vc1.c