Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 22:37:12 +0000 (00:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 22:37:12 +0000 (00:37 +0200)
commit14aef38a698229f12bbf980b4e45f2ee55edfcfe
treeafae850cca16aef5137bd6dd2fb82ab2ae5cff95
parent2ec4586d77c18eff38c128936a67b7d7a2e7f9a0
parent66e6c8a7b4e3ac926302529606bd3e323c28b20f
Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'

* commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f':
  lavu: Add a pixel format for new VDA hwaccel

Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h