diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 20:05:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 20:07:00 +0200 |
| commit | 82edf6727f0663601351081ca1e4fb20d1752972 (patch) | |
| tree | 12479c3ec8cedfa0ec4dda38a72023224f2b5b73 /libavcodec/snow.c | |
| parent | f87dacb27de93f995cb18f9dcc73581ef8fc157b (diff) | |
| parent | f61ce90caa909d131ea6ec205823568a38115529 (diff) | |
| download | ffmpeg-82edf6727f0663601351081ca1e4fb20d1752972.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs
lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs
Add Dolby/DPLII downmix support to libavresample
vorbisdec: replace div/mod in loop with a counter
fate: vorbis: add 5.1 surround test
rtpenc: Allow requesting H264 RTP packetization mode 0
configure: Sort the library listings in the help text alphabetically
dwt: remove variable-length arrays
RTMPT protocol support
http: Properly handle chunked transfer-encoding for replies to post data
http: Fail reading if the connection has gone away
amr: Mark an array const
amr: More space cleanup
rtpenc: Fix memory leaks in the muxer open function
Conflicts:
Changelog
configure
doc/APIchanges
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/snow.c')
| -rw-r--r-- | libavcodec/snow.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index cd0d9feddd..186bc8bd4d 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -440,6 +440,8 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ s->spatial_idwt_buffer= av_mallocz(width*height*sizeof(IDWTELEM)); s->spatial_dwt_buffer= av_mallocz(width*height*sizeof(DWTELEM)); //FIXME this does not belong here + s->temp_dwt_buffer = av_mallocz(width * sizeof(DWTELEM)); + s->temp_idwt_buffer = av_mallocz(width * sizeof(IDWTELEM)); for(i=0; i<MAX_REF_FRAMES; i++) for(j=0; j<MAX_REF_FRAMES; j++) @@ -618,7 +620,9 @@ av_cold void ff_snow_common_end(SnowContext *s) int plane_index, level, orientation, i; av_freep(&s->spatial_dwt_buffer); + av_freep(&s->temp_dwt_buffer); av_freep(&s->spatial_idwt_buffer); + av_freep(&s->temp_idwt_buffer); s->m.me.temp= NULL; av_freep(&s->m.me.scratchpad); |