[FFmpeg-cvslog] Merge commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5'

Michael Niedermayer git at videolan.org
Thu Mar 13 21:33:06 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 13 21:23:42 2014 +0100| [981aa023387ebfaa19ea8079e423d72cd0321b0b] | committer: Michael Niedermayer

Merge commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5'

* commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5':
  build: Drop stray LPC dependency on dsputil

Conflicts:
	configure

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

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





More information about the ffmpeg-cvslog mailing list