• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4c677df2
    Michael Niedermayer authored
    * qatar/master: (22 commits)
      frwu: Employ more meaningful return values.
      fraps: Use av_fast_padded_malloc() instead of av_realloc()
      mjpegdec: use av_fast_padded_malloc()
      eatqi: use av_fast_padded_malloc()
      asv1: use av_fast_padded_malloc()
      avcodec: Add av_fast_padded_malloc().
      swscale: enable dithering in MMX functions.
      swscale: make rgb24 function macros slightly smaller.
      avcodec.h: Remove some disabled cruft.
      swscale: remove obsolete comment.
      swscale-test: Drop unused argc and argv arguments from main().
      zmbv: Employ more meaningful return values.
      zmbvenc: Employ more meaningful return values.
      vc1: prevent null pointer dereference on broken files
      zmbv: check av_realloc() return values and avoid memleaks on ENOMEM
      truespeech: align buffer
      ac3: Do not read past the end of ff_ac3_band_start_tab.
      dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
      dv: Fix null pointer dereference due to ach=0
      dv: check stype
      ...
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/asv1.c
    	libavcodec/avcodec.h
    	libavcodec/eatqi.c
    	libavcodec/fraps.c
    	libavcodec/frwu.c
    	libavcodec/zmbv.c
    	libavformat/dv.c
    	libswscale/swscale.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4c677df2
swfdec.c 7.25 KB