diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-26 04:12:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-26 04:21:15 +0200 |
| commit | 3788a3c0c03585b0f8180a16d2a15b8e0e033313 (patch) | |
| tree | 29000a340cfd9aff729c7853f06152d6756c7219 /cmdutils.c | |
| parent | 05815b3545c2f8718ab25f455d51ea88be43e9c5 (diff) | |
| parent | f80b381bfd956e4470bdbc1854f88cf3ea0764a9 (diff) | |
| download | ffmpeg-3788a3c0c03585b0f8180a16d2a15b8e0e033313.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
graphparser: add a NULL check on the argument passed to strstr
setdar: prefer "sar" over "par" in log info message
fade: fix draw_slice() check on fade->factor value
fade: make draw_slice() chroma check against planes 1 and 2
win32: include the correct header in cmdutils.c
ac3: fix memleak in fixed-point encoder
flashsv: Return more meaningful error values.
flashsv: Employ explicit AVCodec struct initializers.
read AVI palette from the end of extradata
cosmetics: K&R coding style and more whitespace for Flash Screen Video
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 ffc22bfd4e..5ad45e107d 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -154,6 +154,7 @@ static const OptionDef* find_option(const OptionDef *po, const char *name){ } #if defined(_WIN32) && !defined(__MINGW32CE__) +#include <windows.h> /* Will be leaked on exit */ static char** win32_argv_utf8 = NULL; static int win32_argc = 0; |