• 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
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
avconv.c Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
subdir.mak Loading commit data...
version.sh Loading commit data...