[FFmpeg-cvslog] Merge commit '52f954da7594c31ad94c9bcb54290145b59b27f5'

Michael Niedermayer git at videolan.org
Tue Nov 11 21:03:47 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 11 20:58:33 2014 +0100| [81e3f819bd1b1bf6aff7a8adf3f50262f383b9f9] | committer: Michael Niedermayer

Merge commit '52f954da7594c31ad94c9bcb54290145b59b27f5'

* commit '52f954da7594c31ad94c9bcb54290145b59b27f5':
  libavcodec: Unconditionally build xiph.o

Conflicts:
	libavcodec/Makefile

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

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





More information about the ffmpeg-cvslog mailing list