diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-09 04:27:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-09 04:50:56 +0200 |
| commit | 6841c8c5791e857a3327411f23c13b0d28f69f1f (patch) | |
| tree | 37f670ac509799ee0f4a067e2f632cc28a587082 /libavfilter/libmpcodecs | |
| parent | 25308afbb2f7d6d9cb1e36476bc5aa0b3831c703 (diff) | |
| parent | 847aaec682f2bbfaac55ee623364dd4527e0f341 (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
log: Fix an oob array read.
cosmetics: trim trailing whitespace in postproc
Ban strncpy() it's too easy to misuse.
psymodel: Remove wrapper functions.
aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
regtest: remove redundant flags in jpg test
regtest: use run_ffmpeg in do_image_formats
regtest: simplify encoding functions
ffmpeg.c: check for interlaced flag in the correct place.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/libmpcodecs')
| -rw-r--r-- | libavfilter/libmpcodecs/mp_image.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/libmpcodecs/mp_image.h b/libavfilter/libmpcodecs/mp_image.h index 3d566af693..50d3fa19a6 100644 --- a/libavfilter/libmpcodecs/mp_image.h +++ b/libavfilter/libmpcodecs/mp_image.h @@ -33,6 +33,7 @@ #undef rand #undef srand #undef printf +#undef strncpy #define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t" |