[FFmpeg-cvslog] Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d'

Michael Niedermayer git at videolan.org
Tue Jan 21 21:44:18 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 21:26:13 2014 +0100| [8a77baae6e793e0e02077cee6b75dd0c35372a40] | committer: Michael Niedermayer

Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d'

* commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d':
  lavc: do not force the emu edge flag

Conflicts:
	libavcodec/utils.c

There should be no such bugs in ffmpeg, but merging it anyway
as its safer.

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

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





More information about the ffmpeg-cvslog mailing list