1. 06 Mar, 2012 5 commits
    • Michael Niedermayer's avatar
    • Michael Niedermayer's avatar
      aacdec: Fix out of array writes (stack). · a8d67efa
      Michael Niedermayer authored
      This fixes an issue in the code to check the size that will
      be written to match the actual code writing. In the long
      term it would make sense to change this so the counting and
      writing code are the same so they dont need to be kept in sync.
      
      It also increases the array size, which was too small either way
      and adds a redudnant saftey check.
      
      This issue does not affect any FFmpeg release as it has been
      introduced Jan 31 which is narrowly after our last release.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      a8d67efa
    • Bastien Bouclet's avatar
      Fix bink decoder for files with 24px width. · b521f113
      Bastien Bouclet authored
      Fixes ticket #962.
      b521f113
    • Michael Niedermayer's avatar
      diracdec: Correct the bytestream end pointer. · 0f13cc73
      Michael Niedermayer authored
      This fixes some arith decoder overreads and a potential infinite loop.
      
      Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      0f13cc73
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · f095391a
      Michael Niedermayer authored
      * qatar/master: (31 commits)
        cdxl demux: do not create packets with uninitialized data at EOF.
        Replace computations of remaining bits with calls to get_bits_left().
        amrnb/amrwb: Remove get_bits usage.
        cosmetics: reindent
        avformat: do not require a pixel/sample format if there is no decoder
        avformat: do not fill-in audio packet duration in compute_pkt_fields()
        lavf: Use av_get_audio_frame_duration() in get_audio_frame_size()
        dca_parser: parse the sample rate and frame durations
        libspeexdec: do not set AVCodecContext.frame_size
        libopencore-amr: do not set AVCodecContext.frame_size
        alsdec: do not set AVCodecContext.frame_size
        siff: do not set AVCodecContext.frame_size
        amr demuxer: do not set AVCodecContext.frame_size.
        aiffdec: do not set AVCodecContext.frame_size
        mov: do not set AVCodecContext.frame_size
        ape: do not set AVCodecContext.frame_size.
        rdt: remove workaround for infinite loop with aac
        avformat: do not require frame_size in avformat_find_stream_info() for CELT
        avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3
        avformat: do not require frame_size in avformat_find_stream_info() for AAC
        ...
      
      Conflicts:
      	doc/APIchanges
      	libavcodec/Makefile
      	libavcodec/avcodec.h
      	libavcodec/h264.c
      	libavcodec/h264_ps.c
      	libavcodec/utils.c
      	libavcodec/version.h
      	libavcodec/x86/dsputil_mmx.c
      	libavformat/utils.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      f095391a
  2. 05 Mar, 2012 35 commits