[SCM] libva/master: Merge commit 'upstream/1.0.14'

[siretart at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit d7665dac46f36a21e0a20c5c530d13bd58dd9362
Merge: d804e38d612d7b4be8fe7cd84e93ea1264ce6b16 edf7c652b926da92b23aa4725067b5a16d8c83e2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Oct 31 20:08:24 2011 +0100

    Merge commit 'upstream/1.0.14'

diff --combined .gitignore
index 133a56f,ac24e17..e0ba307
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/.pc
  *~
  *.o
  *.lo
@@@ -42,5 -41,6 +42,6 @@@ TAG
  /test/basic/test_11
  /test/decode/mpeg2vldemo
  /test/encode/h264encode
+ /test/encode/avcenc
  /test/putsurface/putsurface
  /test/vainfo

-- 
libva packaging