• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · eae3cf06
    Michael Niedermayer authored
    * qatar/master:
      flvdec: Fix invalid pointer deferences when parsing index
      configure: disable hardware capabilities ELF section with suncc on Solaris x86
      Use explicit struct initializers for AVCodec declarations.
      Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
      adpcmenc: Set bits_per_coded_sample
      adpcmenc: fix QT IMA ADPCM encoder
      adpcmdec: Fix QT IMA ADPCM decoder
      permit decoding of multichannel ADPCM_EA_XAS
      Fix input buffer size check in adpcm_ea decoder.
      fft: avoid a signed overflow
      mpegps: Handle buffer exhaustion when reading packets.
    
    Conflicts:
    	libavcodec/adpcm.c
    	libavcodec/adpcmenc.c
    	libavdevice/alsa-audio-enc.c
    	libavformat/flvdec.c
    	libavformat/mpeg.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    eae3cf06
idroqenc.c 1.38 KB