merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:15:38 +0000 (01:15 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:15:38 +0000 (01:15 +0900)
commitca1d4de86eaa979df4cb9bcee8fc5a57880bcb1e
tree1839116b117cf8670643f808fac04724ef63c59d
parentb4616a3fdd9b14fc58e021f6aa2db2aa8ee7a41b
merge with master
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
gst-libs/gst/vaapi/gstvaapidecoder_vc1.c
gst-libs/gst/vaapi/gstvaapisurface_userptr.c
gst-libs/gst/vaapi/gstvaapisurface_userptr.h
gst-libs/gst/vaapi/gstvaapisurfacepool.c
gst-libs/gst/vaapi/gstvaapitypes.h
gst/vaapi/gstvaapisink.c