1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Michael Niedermayer 18b0c39f99 Merge remote-tracking branch 'qatar/master'
* 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: Michael Niedermayer <michaelni@gmx.at>
2012-08-10 16:25:23 +02:00
..
2012-02-26 07:48:45 +01:00
2012-05-08 16:53:03 +02:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
caf
2012-05-14 13:05:30 +01:00
2012-05-10 04:17:03 +02:00
2012-03-12 17:01:58 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
crc
2012-05-15 19:47:18 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-03-02 18:58:19 +02:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-10 12:18:38 +01:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-02-26 07:48:45 +01:00
2012-07-29 08:06:30 +02:00
2012-03-27 17:54:04 -07:00
2012-03-23 14:03:03 -07:00
2012-03-20 14:12:53 -04:00
md5
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
mtv
2012-05-15 11:16:34 +02:00
2012-08-03 15:18:12 +00:00
2012-08-03 15:18:12 +00:00
2012-07-10 00:04:23 +00:00
2012-05-14 12:50:01 +01:00
ptx
2012-07-17 17:06:24 +00:00
2012-02-26 07:48:45 +01:00
2012-04-01 15:56:08 -04:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-06-22 00:16:03 +00:00
sha
smc
2012-02-26 07:48:45 +01:00
2012-05-17 03:29:21 +02:00
2012-07-29 08:06:30 +02:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:21:28 +02:00
2012-06-29 20:20:02 +02:00
2012-07-26 22:22:54 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-06-22 00:16:03 +00:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-03-03 17:03:26 -05:00
2012-07-25 14:29:39 +02:00
2012-06-15 19:10:58 +02:00
2012-07-25 14:29:39 +02:00
2012-06-15 19:10:58 +02:00
w64
2012-02-26 07:48:45 +01:00
2012-07-29 08:06:30 +02:00
2012-07-29 08:06:30 +02:00
2012-07-29 08:06:30 +02:00
2012-07-04 15:10:57 +03:00
2012-01-08 18:33:59 -08:00
2012-03-22 19:52:56 +01:00