[SCM] libva/master: Merge tag 'upstream/1.1.0'

[mfv-guest at users.alioth.debian.org]

Imported Upstream version 1.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d882c0405a8aafaefc59ef6644a42ca1b5961ad9
X-Git-Newrev: 4b8dbb456cbb6fc3232a98f05db27392e120652b

The following commit has been merged in the master branch:
commit ec58a718917326cdf9d7e34a22e1b1aade6f6fd8
Merge: d882c0405a8aafaefc59ef6644a42ca1b5961ad9 d937586d271c5967f8c157a957138a17135ed28c
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Wed Jun 6 18:00:23 2012 +0200

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0
    # gpg: Signature made Wed 06 Jun 2012 06:00:19 PM CEST using RSA key ID 83B2CF7A
    # gpg: Good signature from "Matteo F. Vescovi <mfv.debian at gmail.com>"

diff --combined .gitignore
index e0ba307,fd8ac05..dcc2c50
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/.pc
  *~
  *.o
  *.lo
@@@ -10,25 -9,26 +10,26 @@@
  *.pc
  .deps
  .libs
- install-sh
- libtool
- ltmain.sh
- missing
  Makefile
  Makefile.in
- config.h
- config.h.in
- stamp-h1
+ TAGS
  aclocal.m4
  autom4te.cache
  config.guess
+ config.h
+ config.h.in
  config.log
  config.status
  config.sub
  configure
+ debian.upstream/changelog
+ debian.upstream/control
  depcomp
- TAGS
- /va/va_version.h
+ install-sh
+ libtool
+ ltmain.sh
+ missing
+ stamp-h1
  /test/basic/test_01
  /test/basic/test_02
  /test/basic/test_03
@@@ -40,8 -40,14 +41,14 @@@
  /test/basic/test_09
  /test/basic/test_10
  /test/basic/test_11
+ /test/decode/loadjpeg
  /test/decode/mpeg2vldemo
- /test/encode/h264encode
+ /test/egl/va_egl
  /test/encode/avcenc
+ /test/encode/h264encode
  /test/putsurface/putsurface
- /test/vainfo
+ /test/transcode/mpeg2transcode
+ /test/v4l_h264/decode/decode
+ /test/v4l_h264/encode/encode
+ /test/vainfo/vainfo
+ /va/va_version.h

-- 
libva packaging