[FFmpeg-cvslog] Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'

Michael Niedermayer git at videolan.org
Mon Aug 4 21:33:10 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 21:24:24 2014 +0200| [073c074447c253111790c0472fb83f184e66814e] | committer: Michael Niedermayer

Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'

* commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26':
  pixdesc: Support pixelformat aliases

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list