diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-13 22:23:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-13 22:24:47 +0200 |
| commit | ca1dfea12771b585846fb86aa08c3d7f066a3cc4 (patch) | |
| tree | 6db034b36245b9fe51d9a41d41be1718a3be8b89 /libavcodec/rv34.c | |
| parent | 75af0e6a1601a4246d6409ca28dc80a3ba0e8d6e (diff) | |
| parent | 3304a1e69a8a050eb66d2304acd2d01354fa1aac (diff) | |
| download | ffmpeg-ca1dfea12771b585846fb86aa08c3d7f066a3cc4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: add dithering to yuv2yuvX_altivec_real
rv34: free+allocate buffer instead of reallocating it to preserve alignment
h264: add missing brackets.
swscale: use 15-bit intermediates for 9/10-bit scaling.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 193c807d25..324cf717c2 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1311,7 +1311,8 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int if (!r->tmp_b_block_base || s->width != r->si.width || s->height != r->si.height) { int i; - r->tmp_b_block_base = av_realloc(r->tmp_b_block_base, s->linesize * 48); + av_free(r->tmp_b_block_base); //realloc() doesn't guarantee alignment + r->tmp_b_block_base = av_malloc(s->linesize * 48); for (i = 0; i < 2; i++) r->tmp_b_block_y[i] = r->tmp_b_block_base + i * 16 * s->linesize; for (i = 0; i < 4; i++) |