diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-09 00:33:32 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-09 00:33:32 +0400 |
commit | ca1f2b3e10b79958d36db296f142fbd232f997e6 (patch) | |
tree | 4ed519b7bf7ece90209c4e2e0f1c81423bf16f19 /cmdutils.c | |
parent | d8ce478c43d9096bcf38b50c849e9ed45647542d (diff) | |
parent | 66a297975d19e0d9b8a5ff8a723dcd2116a506ce (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cmutils: include shellapi.h on Win32 (for CommandLineToArgvW).
x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).
id3v2: add a mimetype for bmp pictures.
flacdec: be less strict when parsing attached pictures.
flacdec: don't create an attached picture stream until we have all information.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
-rw-r--r-- | cmdutils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c index 024c801951..e90a9ee6fb 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -190,6 +190,7 @@ static const OptionDef *find_option(const OptionDef *po, const char *name) #if defined(_WIN32) && !defined(__MINGW32CE__) #include <windows.h> +#include <shellapi.h> /* Will be leaked on exit */ static char** win32_argv_utf8 = NULL; static int win32_argc = 0; |