[FFmpeg-cvslog] Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'

Michael Niedermayer git at videolan.org
Mon Jan 6 14:29:02 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 13:57:29 2014 +0100| [80d44190c4d909e9685d04bcde693da3e2441dfd] | committer: Michael Niedermayer

Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'

* commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f':
  kgv1dec: replace forcing EMU_EDGE by a copy

Conflicts:
	libavcodec/kgv1dec.c

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

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





More information about the ffmpeg-cvslog mailing list