[FFmpeg-cvslog] Merge commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307'

Michael Niedermayer git at videolan.org
Mon Jan 6 13:55:50 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 13:48:46 2014 +0100| [d1134ababdbd55ef0330c09deccfb32daaa809b5] | committer: Michael Niedermayer

Merge commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307'

* commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307':
  4xm: replace forcing EMU_EDGE by a copy

Conflicts:
	libavcodec/4xm.c

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

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





More information about the ffmpeg-cvslog mailing list