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-08-09 19:56:21 +02:00
2011-09-27 22:00:20 +02:00
2011-08-09 19:56:25 +02:00
2011-10-31 11:06:19 +01:00
2011-04-10 04:31:54 +02:00
2011-10-27 00:25:32 +02:00
2011-01-30 03:41:47 +01:00