Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Jan 2013 12:42:42 +0000 (13:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Jan 2013 12:42:42 +0000 (13:42 +0100)
commitdae382b5b28df492e4bfbac35ac6b0cddc994337
treecfc66c3ea9c7a03b53b9e2683fb4f33898e48c28
parent15daa8f9ddaf678b924ebe997f7b62381c0e2e0a
parentf89466ad6fd69ea570790e9227e612a751703a37
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
  pixfmt: add picture format for VDPAU

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