ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d8dda169384e3935d38da2ed127ba82fd666ee7 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog