diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 00:11:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 00:11:58 +0200 |
| commit | 73a502dd436425875fae1305d47cf0c1fbf24d68 (patch) | |
| tree | 4a3d3f0c1f52f1146b889272ea135bb97d00646d /cmdutils.c | |
| parent | ea189b77eb89134a9d3928631c579ca0a28e1a3a (diff) | |
| parent | 075933a0687974fca74d6d4ac388d24766d8dc78 (diff) | |
| download | ffmpeg-73a502dd436425875fae1305d47cf0c1fbf24d68.tar.gz | |
Merge branch 'master' into oldabi
* master: (37 commits)
vsrc_buffer: 10l mixed up input & output sizes. (funnily this worked 99% of the time) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Add MxPEG decoder
Add support for picture_ptr field in MJpegDecodeContext
Move MJPEG's input buffer preprocessing in separate public function
Support reference picture defined by bitmask in MJPEG's SOS decoder
DCA/DTA encoder
vsrc_buffer: Reinit scale filter when an existing filter is used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vsrc_buffer: set output timebase when output equalization is done Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vsrc_buffer: Set output size Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vsrc_buffer: fix NULL dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
bfi: store palette data in the context
Fix issue1503, this fix may be incomplete we need more samples to know for sure. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wmadec: prevent null pointer call. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
fraps: do not set avctx->pix_fmt to none in decode_init()
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
lsws: prevent overflow in sws_init_context()
ffplay: fix logic for selecting the show mode in case of missing video
...
Conflicts:
libavformat/avidec.c
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 17c3a5363c..83c737f84a 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; |