ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun  8 
20:39:38 2015 +0200| [a4557b7a98f78222d9616fb36cb8073cd16f11ff] | committer: 
Michael Niedermayer

Merge commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2'

* commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2':
  configure: Support MSVC 2015

Conflicts:
        configure
        libavutil/internal.h

Merged-by: Michael Niedermayer <michae...@gmx.at>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to