FFmpeg/libavcodec
Michael Niedermayer 259a960f1b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vp6: Fix illegal read.
  avfilter: Don't copy garbage from the stack when setting up video pictures.
  avcodec: Make sure codec_type is set by avcodec_get_context_defaults2
  avcodec: Remove a misplaced and useless attribute_deprecated
  avconv: add -dump_attachment option.
  avconv: add -attach option.
  avconv: make negative mappings disable only streams from the specified file
  fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64

Conflicts:
	libavcodec/options.c

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