• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 794006f8
    Michael Niedermayer authored
    * qatar/master:
      fft: init functions with INIT_XMM/YMM.
      pcmenc: set frame_size to 0.
      gsm demuxer: use generic seeking instead of a gsm-specific function.
      gsm demuxer: return packets with only 1 gsm block at a time.
      avcodec: add GSM parser
      doc: Replace ffmpeg references in avserver config file by avconv.
      doc: Fix names of av_log color environment variables.
      Fix a bunch of platform name and other typos.
      Add some missing changelog entries and release 0.8_beta2
      No longer build libpostproc by default
      wtv: fix memleaks during normal operation
      threads: add CODEC_CAP_AUTO_THREADS for libvpx and xavs
    
    Conflicts:
    	Changelog
    	RELEASE
    	cmdutils.c
    	configure
    	doc/ffserver.conf
    	doc/platform.texi
    	ffplay.c
    	libavcodec/Makefile
    	libavcodec/version.h
    	libavformat/wtv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    794006f8
msgsmdec.c 1.32 KB