h264: fix conflicts during merge and set VASurfaceID appropriately.
-rw-r--r-- 1473 .gitignore
-rw-r--r-- 116 .gitmodules
-rw-r--r-- 270 AUTHORS
-rw-r--r-- 26530 COPYING.LIB
-rw-r--r-- 697 Makefile.am
-rw-r--r-- 6360 NEWS
-rw-r--r-- 2750 README
-rwxr-xr-x 930 autogen.sh
-rw-r--r-- 18564 configure.ac
drwxr-xr-x - debian.upstream
drwxr-xr-x - docs
drwxr-xr-x - ext
drwxr-xr-x - gst-libs
drwxr-xr-x - gst
drwxr-xr-x - pkgconfig
drwxr-xr-x - tests