Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 11:18:05 +0000 (13:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 11:18:05 +0000 (13:18 +0200)
commit50b5477616c8f6001a575fb953db45dd9a14662c
tree4af87567da08f040334d6ac938528c14b116825c
parenteadba3e94daac2f48fd9ce7c9fdf5a562d3274ed
parentb94e4acb4874843e914fd3cb8e089aff0756bb4a
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>
cmdutils.c
ffmpeg_opt.c
libavcodec/vc1dec.c
libavfilter/af_amix.c
libavfilter/af_channelmap.c
libavformat/matroskaenc.c
libavformat/swfenc.c
library.mak