diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 13:18:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 13:18:05 +0200 |
| commit | 50b5477616c8f6001a575fb953db45dd9a14662c (patch) | |
| tree | 4af87567da08f040334d6ac938528c14b116825c /libavcodec/raw.h | |
| parent | eadba3e94daac2f48fd9ce7c9fdf5a562d3274ed (diff) | |
| parent | b94e4acb4874843e914fd3cb8e089aff0756bb4a (diff) | |
| download | ffmpeg-50b5477616c8f6001a575fb953db45dd9a14662c.tar.gz | |
Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'
* commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a':
cmdutils_read_file: increment *size after writing the trailing \0
af_resample: unref out_buf when avresample_convert returns 0
af_amix: prevent memory leak on error path
vc1dec: prevent memory leak in error path
vc1dec: prevent memory leak on av_realloc error
af_channelmap: free old extended_data on reallocation
avconv: simplify memory allocation in copy_chapters
matroskaenc: check cue point validity before reallocation
swfenc: error out for more than 1 audio or video stream
build: link test programs only against static libs
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/raw.h')
0 files changed, 0 insertions, 0 deletions