[FFmpeg-cvslog] Merge commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f'

Michael Niedermayer git at videolan.org
Sun Nov 23 01:26:26 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 23 01:18:51 2014 +0100| [6d8dda169384e3935d38da2ed127ba82fd666ee7] | committer: Michael Niedermayer

Merge commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f'

* commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f':
  lavf: Remove a redundant include of sys/stat.h

Conflicts:
	libavformat/os_support.h

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

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





More information about the ffmpeg-cvslog mailing list