[FFmpeg-cvslog] Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'

Michael Niedermayer git at videolan.org
Mon Jun 23 00:51:33 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 00:45:58 2014 +0200| [7695a538ed24e3cef52f74a4eee731d137a97f4e] | committer: Michael Niedermayer

Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'

* commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0':
  build: Record explicit dependency of intrax8 on error resilience

Conflicts:
	configure

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

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





More information about the ffmpeg-cvslog mailing list