diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-04 17:04:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-04 17:04:51 +0200 |
| commit | 9dcc4c30f9d8ef70d3c07b4a77fdc507e8766107 (patch) | |
| tree | ae6bb70dcf614bfbf032b5fe4ac4f712777cd0c3 /libavformat | |
| parent | 9de7622927b1b0ec6f8045b17b3116f046f44b87 (diff) | |
| parent | b36f87ff90d87687f574d51385f47bb98d14600a (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: add support for bdver1 and bdver2 CPU types.
avio: make avio_close NULL the freed buffer
pixdesc: cosmetics
proresenc: Don't free a buffer not owned by the codec
proresenc: Write the full value in one put_bits call
adpcmenc: Calculate the IMA_QT predictor without overflow
x86: Add convenience macros to check for CPU extensions and flags
x86: h264dsp: drop some unnecessary ifdefs around prototype declarations
mss12: merge decode_pixel() and decode_top_left_pixel()
mss12: reduce SliceContext size from 1067 to 164 KB
mss12: move SliceContexts out of the common context into the codec contexts
Conflicts:
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/aviobuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index f1ac24e844..282a62e2b7 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -796,7 +796,7 @@ int avio_close(AVIOContext *s) avio_flush(s); h = s->opaque; - av_free(s->buffer); + av_freep(&s->buffer); if (!s->write_flag) av_log(s, AV_LOG_DEBUG, "Statistics: %"PRId64" bytes read, %d seeks\n", s->bytes_read, s->seek_count); av_free(s); |