Files
ffmpeg/libavcodec
Michael Niedermayer 70d9fb6963 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  sunrast: Check for out of bounds reads
  lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
  lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
  Add libvpx presets.
  doc/avtools: add forgotten part to stream specifiers description
  swscale: prevent overflow during initialization
  g722: Add a fate test for the encoder
  fate: Add a target for creating a 16000 Hz mono synthetic audio file
  macosx: use the default surface on newer sdl

Conflicts:
	ffplay.c
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-19 02:08:59 +02:00
..
2011-09-30 02:43:20 +02:00
2011-10-11 14:57:58 -04:00
2011-10-10 21:36:12 +02:00
2011-10-10 21:36:12 +02:00
2011-09-16 05:53:14 +02:00
2011-09-02 05:21:25 +02:00
2011-10-15 20:30:54 +02:00
2011-09-02 05:21:25 +02:00
2011-10-10 21:36:13 +02:00
2011-10-10 02:58:18 +02:00
2011-09-24 21:11:01 +02:00
2011-09-25 21:16:55 +02:00
2011-08-30 05:41:44 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-09-24 06:01:45 +02:00
2011-10-07 02:29:31 +02:00
2011-09-28 18:43:49 +02:00
2011-09-08 05:34:17 +02:00
2011-09-15 13:23:04 -07:00
2011-09-26 02:28:21 +02:00
2011-09-11 04:07:08 +02:00
2011-10-07 17:15:45 +02:00
2011-10-07 16:25:31 +02:00
2011-10-09 03:22:57 +02:00
2011-09-17 21:55:11 +02:00
2011-09-17 21:55:11 +02:00
2011-10-10 21:36:13 +02:00
2011-09-15 13:23:04 -07:00
2011-10-09 03:22:49 +02:00
2011-09-07 12:16:15 +02:00
2011-09-11 12:54:47 +02:00
2011-10-06 23:33:09 +02:00
2011-10-07 00:27:03 +02:00
2011-10-09 03:22:57 +02:00