Merge branch '0.10_basevideodec' into 1.0
authorSreerenj Balachandran <sreerenj.balachandran@intel.com>
Mon, 1 Oct 2012 11:18:41 +0000 (14:18 +0300)
committerSreerenj Balachandran <sreerenj.balachandran@intel.com>
Mon, 1 Oct 2012 11:18:41 +0000 (14:18 +0300)
commitd42015161637b3064b8cb30b6cc6a80e287a4da0
treecfabe641efa09b0ee669f99159697b8a473b4fac
parent69822a5d8b3837875cdb9801e9aba0fe9236bee3
parente5a56d771b2f884cb00446b29e397997283fa5b5
Merge branch '0.10_basevideodec' into 1.0

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