[FFmpeg-cvslog] Merge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'

Michael Niedermayer git at videolan.org
Mon Jan 6 15:24:26 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 15:17:34 2014 +0100| [4e276b84e697ec9c21cec1fb0a4b2ad7e8cbf4ed] | committer: Michael Niedermayer

Merge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'

* commit '8058284ce09030b47512746d726fb2ad3ae8a20f':
  lavc: add 422/444 YUV with alpha to align_dimensions()

Conflicts:
	libavcodec/utils.c

Only cosmetical changes happen as these formats already where in the list before

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

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





More information about the ffmpeg-cvslog mailing list