Michael Niedermayer dae382b5b2 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>

2013-01-12 13:42:42 +01:00

53 KiB

Raw Blame History

View Raw