[FFmpeg-cvslog] Merge commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94' into release/2.2

Michael Niedermayer git at videolan.org
Mon Aug 11 18:35:03 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 11 18:02:19 2014 +0200| [45a529d805cf09d0d43342c925f38e3b56c3a6e5] | committer: Michael Niedermayer

Merge commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94' into release/2.2

* commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94':
  huffyuvdec: check width size for yuv422p

Conflicts:
	libavcodec/huffyuvdec.c

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

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





More information about the ffmpeg-cvslog mailing list