[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Sat Jan 12 14:01:16 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 12 13:42:42 2013 +0100| [dae382b5b28df492e4bfbac35ac6b0cddc994337] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dae382b5b28df492e4bfbac35ac6b0cddc994337
---





More information about the ffmpeg-cvslog mailing list