• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 18b0c39f
    Michael Niedermayer authored
    * qatar/master:
      g723.1: fix addition overflow
      g723.1: simplify and fix multiplication overflow
      g723.1: deobfuscate an expression
      g723.1: remove unused #includes
      ARM: add missing "cc" clobber in av_clipl_int32_arm()
      rtmp: Factorize the code by adding handle_invoke_error
      rtmp: Factorize the code by adding handle_invoke_status
      rtmp: Factorize the code by adding handle_invoke_result
      libavutil: remove unused av_abort() macro
      ffmenc: replace if/abort with assert()
      libavutil: drop offsetof() fallback definition
      libavutil: drop fallback definitions of INTxx_MIN/MAX
      configure: Check for a sctp struct instead of just the header
      configure: suncc: Add -xc99 to dependency flags, required on Solaris
      doxygen: Fix function parameter names to match the code
      doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
      swf: Move shared table out of the header file
      swf: Move swf_audio_codec_tags table to the only place it is used
      fate: add G.723.1 decoder tests
    
    Conflicts:
    	configure
    	doc/platform.texi
    	libavformat/Makefile
    	libavutil/arm/intmath.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    18b0c39f
ffmenc.c 7.9 KB