diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 20:39:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 20:39:38 +0200 |
| commit | a4557b7a98f78222d9616fb36cb8073cd16f11ff (patch) | |
| tree | 458602df0a2d7566f5f5f541e4cd40335729cbba /libavcodec/vcr1.c | |
| parent | 56f0fe6b8434d25917c41a343323950291d8db21 (diff) | |
| parent | a6f19d6a9f8d1e08653d9d77581e8c823f4955c2 (diff) | |
| download | ffmpeg-a4557b7a98f78222d9616fb36cb8073cd16f11ff.tar.gz | |
Merge commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2'
* commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2':
configure: Support MSVC 2015
Conflicts:
configure
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vcr1.c')
0 files changed, 0 insertions, 0 deletions