[FFmpeg-cvslog] Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'

Michael Niedermayer git at videolan.org
Sat Mar 1 05:23:49 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 05:11:37 2014 +0100| [c4c2b2ea5c0a1879f512c2023956d7322edc98d3] | committer: Michael Niedermayer

Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'

* commit '0a36988e48dd581d29e77f768f987738bdf365f0':
  build: Let AMV decoder depend on the SP5X decoder

Conflicts:
	configure
	libavcodec/Makefile

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

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





More information about the ffmpeg-cvslog mailing list