1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
Michael Niedermayer 50b5477616 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>
2012-10-10 13:18:05 +02:00
..
2012-10-08 02:09:28 +02:00
2012-10-09 04:00:55 +02:00
2012-10-08 09:06:25 +00:00
2012-09-21 01:03:31 +02:00
2012-10-08 09:06:25 +00:00
2012-09-04 18:37:54 +03:00
2012-09-07 12:36:00 +02:00
2012-09-30 14:05:04 +00:00
2012-10-09 16:48:43 +02:00
2012-09-03 23:26:14 +02:00
2012-10-08 09:06:25 +00:00
2012-10-03 16:14:59 +02:00
2012-10-10 07:49:03 +00:00
2012-10-09 06:02:34 +02:00
2012-09-10 21:04:01 +02:00
2012-10-01 13:42:44 -04:00
2012-09-18 17:37:41 +02:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 22:49:23 -05:00
2012-10-09 10:13:14 +02:00
2012-09-30 13:39:38 +00:00
2012-10-08 09:06:25 +00:00
2012-09-23 15:24:08 +02:00