• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 259a960f
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    259a960f
avconv.c 162 KB