[FFmpeg-cvslog] Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'

Michael Niedermayer git at videolan.org
Fri Jul 19 11:03:34 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 19 10:56:10 2013 +0200| [c88503e3f6bd7881f147d340bf222a629daa55fc] | committer: Michael Niedermayer

Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'

* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da':
  Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/

Conflicts:
	compat/aix/math.h

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

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





More information about the ffmpeg-cvslog mailing list