Merge branch 'gwe_master' into 0.10_basevideodec
authorSreerenj Balachandran <sreerenj.balachandran@intel.com>
Mon, 1 Oct 2012 11:10:28 +0000 (14:10 +0300)
committerSreerenj Balachandran <sreerenj.balachandran@intel.com>
Mon, 1 Oct 2012 11:10:28 +0000 (14:10 +0300)
commite5a56d771b2f884cb00446b29e397997283fa5b5
tree71c03ccc5d639ff7706a4b69efb93bc8f4cb1cb3
parent702f5948487bd0fe24a608d423365dda8eb5c262
parent07ee807f8842bbde442feed7582d90237125c6a8
Merge branch 'gwe_master' into 0.10_basevideodec

Conflicts:
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
configure.ac
gst-libs/gst/vaapi/gstvaapidecoder_h264.c