1. 26 Jan, 2012 5 commits
    • Michael Niedermayer's avatar
      diracdec: Check dirac_unpack_idwt_params parameters before storing them. · e2291ea1
      Michael Niedermayer authored
      Fixes CVE-2011-3949
      
      Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      e2291ea1
    • Clément Bœsch's avatar
      doc: remove trailing 's' to metadata. · ee0cab77
      Clément Bœsch authored
      metadata is already plural.
      
      Found-by: Alexander Strasser
      ee0cab77
    • Michael Niedermayer's avatar
      mp3dec: Check for memcpy size to be positive. · 46095f42
      Michael Niedermayer authored
      No, ive no testcase.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      46095f42
    • Thierry Foucu's avatar
      Fix a heap-buffer-overflow · 10e9d1f7
      Thierry Foucu authored
      In some case, what left to read from ptr is smaller than EXTRABYTES.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      10e9d1f7
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 3c5fe5b5
      Michael Niedermayer authored
      * qatar/master: (22 commits)
        wma: Clip WMA1 and WMA2 frame length to 11 bits.
        movenc: Don't require frame_size to be set for modes other than mov
        doc: Update APIchanges with info on muxer flushing
        movenc: Reindent a block
        tools: Remove some unnecessary #undefs.
        rv20: prevent calling ff_h263_decode_mba() with unset height/width
        tools: K&R reformatting cosmetics
        Ignore generated aviocat and ismindex tools.
        build: Automatically include architecture-specific library Makefile snippets.
        indeo5: prevent null pointer dereference on broken files
        pktdumper: Use usleep instead of sleep
        cosmetics: Remove some unnecessary block braces.
        Drop unnecessary prefix from *sink* variable and struct names.
        Add a tool for creating smooth streaming manifests
        movdec: Calculate an average bit rate for fragmented streams, too
        movenc: Write the sample rate instead of time scale in the stsd atom
        movenc: Add a separate ismv/isma (smooth streaming) muxer
        movenc: Allow the caller to decide on fragmentation
        libavformat: Add a flag for muxers that support write_packet(NULL) for flushing
        movenc: Add support for writing fragmented mov files
        ...
      
      Conflicts:
      	Changelog
      	cmdutils.c
      	cmdutils.h
      	doc/APIchanges
      	ffmpeg.c
      	ffplay.c
      	libavfilter/Makefile
      	libavformat/Makefile
      	libavformat/avformat.h
      	libavformat/movenc.c
      	libavformat/movenc.h
      	libavformat/version.h
      	tools/graph2dot.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      3c5fe5b5
  2. 25 Jan, 2012 35 commits