diff options
| author | Michael Niedermayer <[email protected]> | 2012-02-02 02:02:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2012-02-02 02:24:09 +0100 |
| commit | 4c677df27cc62e5dd8df9da9d0ca9fb7d963bc08 (patch) | |
| tree | 1453699ac3b21c5c25889aaed590ca4bc0c7a755 /libavcodec/asv1.c | |
| parent | 5cd8afee99c83b62e1474f122d947de7e4ad9ff5 (diff) | |
| parent | 5ff88020ac4cd285fa00d0c559aa196bbd8526d7 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
frwu: Employ more meaningful return values.
fraps: Use av_fast_padded_malloc() instead of av_realloc()
mjpegdec: use av_fast_padded_malloc()
eatqi: use av_fast_padded_malloc()
asv1: use av_fast_padded_malloc()
avcodec: Add av_fast_padded_malloc().
swscale: enable dithering in MMX functions.
swscale: make rgb24 function macros slightly smaller.
avcodec.h: Remove some disabled cruft.
swscale: remove obsolete comment.
swscale-test: Drop unused argc and argv arguments from main().
zmbv: Employ more meaningful return values.
zmbvenc: Employ more meaningful return values.
vc1: prevent null pointer dereference on broken files
zmbv: check av_realloc() return values and avoid memleaks on ENOMEM
truespeech: align buffer
ac3: Do not read past the end of ff_ac3_band_start_tab.
dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
dv: Fix null pointer dereference due to ach=0
dv: check stype
...
Conflicts:
doc/APIchanges
libavcodec/asv1.c
libavcodec/avcodec.h
libavcodec/eatqi.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/zmbv.c
libavformat/dv.c
libswscale/swscale.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/asv1.c')
| -rw-r--r-- | libavcodec/asv1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c index 9eeec2675a..0845959d37 100644 --- a/libavcodec/asv1.c +++ b/libavcodec/asv1.c @@ -408,7 +408,8 @@ static int decode_frame(AVCodecContext *avctx, p->pict_type= AV_PICTURE_TYPE_I; p->key_frame= 1; - av_fast_padded_malloc(&a->bitstream_buffer, &a->bitstream_buffer_size, buf_size); + av_fast_padded_malloc(&a->bitstream_buffer, &a->bitstream_buffer_size, + buf_size); if (!a->bitstream_buffer) return AVERROR(ENOMEM); |