[FFmpeg-cvslog] Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'

Michael Niedermayer git at videolan.org
Mon Aug 4 22:32:58 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 22:26:13 2014 +0200| [2f5bf2f7f20f29bad8c459824eaf33f2e0e483b5] | committer: Michael Niedermayer

Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'

* commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820':
  swscale: support AV_PIX_FMT_YA16 as input

Conflicts:
	libswscale/swscale_unscaled.c

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

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





More information about the ffmpeg-cvslog mailing list