ffmpeg/libavcodec
Michael Niedermayer 151ecc2aec Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits)
  avconv: deprecate the -deinterlace option
  doc: Fix the name of the new function
  aacenc: make sure to encode enough frames to cover all input samples.
  aacenc: only use the number of input samples provided by the user.
  wmadec: Verify bitstream size makes sense before calling init_get_bits.
  kmvc: Log into a context at a log level constant.
  mpeg12: Pad framerate tab to 16 entries.
  kgv1dec: Increase offsets array size so it is large enough.
  kmvc: Check palsize.
  nsvdec: Propagate errors
  nsvdec: Be more careful with av_malloc().
  nsvdec: Fix use of uninitialized streams.
  movenc: cosmetics: Get rid of camelCase identifiers
  swscale: more generic check for planar destination formats with alpha
  doc: Document mov/mp4 fragmentation options
  build: Use order-only prerequisites for creating FATE reference file dirs.
  x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf
  rtsp: Remove some unused variables from ff_rtsp_connect().
  avutil: make intfloat api public
  avformat_write_header(): detail error message
  ...

Conflicts:
	doc/APIchanges
	doc/ffmpeg.texi
	doc/muxers.texi
	ffmpeg.c
	libavcodec/kmvc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_yasm.asm
	libavcodec/x86/pngdsp-init.c
	libavformat/movenc.c
	libavformat/movenc.h
	libavformat/mpegtsenc.c
	libavformat/nsvdec.c
	libavformat/utils.c
	libavutil/avutil.h
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-31 02:46:26 +01:00
..
2011-06-02 20:06:00 +01:00
2011-11-25 13:19:54 +00:00
2012-01-28 21:20:42 +01:00
2012-01-03 16:28:17 -05:00
2012-01-14 01:17:06 +01:00
2012-01-17 20:16:35 +01:00
2012-01-14 17:23:57 +01:00
2011-09-16 05:53:14 +02:00
2012-01-12 16:32:55 +01:00
2012-01-11 21:29:25 +01:00
2011-11-12 20:01:05 +01:00
2012-01-14 04:47:27 +01:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-11-12 20:01:50 +01:00
2011-12-28 22:05:24 +01:00
2011-04-26 22:06:13 +02:00
2012-01-28 21:59:01 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-11-05 00:02:31 +01:00
2012-01-19 17:12:43 +01:00
2012-01-26 17:05:57 +01:00
2012-01-14 01:15:42 +01:00
2011-11-05 00:02:38 +01:00
2011-12-10 11:58:03 +01:00
2011-12-19 16:30:30 +01:00
2012-01-17 20:16:35 +01:00
2012-01-29 21:52:55 +01:00
2011-10-10 02:58:18 +02:00
2011-09-24 21:11:01 +02:00
2011-12-30 20:00:53 +01:00
2011-09-25 21:16:55 +02:00
2012-01-11 08:56:24 -05:00
2012-01-11 08:56:24 -05:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-12-23 05:58:32 +01:00
2012-01-26 19:54:38 +01:00
2011-10-21 01:00:41 -07:00
2011-05-11 05:47:02 +02:00
2011-10-21 01:00:41 -07:00
2012-01-15 14:13:25 +01:00
2012-01-30 11:24:02 +01:00
2012-01-25 18:55:32 +01:00
2011-05-24 01:31:53 +02:00
2012-01-12 16:32:55 +01:00
2011-07-21 18:10:58 +01:00
2011-09-08 05:34:17 +02:00
2011-11-13 15:43:09 +01:00
2012-01-28 23:21:03 +01:00
2012-01-28 22:08:20 +01:00
2012-01-28 22:08:20 +01:00
2011-11-24 15:39:41 +01:00
2012-01-07 00:11:43 +01:00
2012-01-12 16:32:55 +01:00
2011-12-17 05:04:56 +01:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-21 13:48:10 +02:00
2012-01-28 22:08:20 +01:00
2011-11-11 18:40:19 +01:00
2012-01-31 00:13:24 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2011-12-30 20:00:53 +01:00
2011-11-12 20:15:21 +01:00
2012-01-28 11:04:19 +01:00
2012-01-12 17:02:13 +01:00
2011-10-27 15:27:32 +02:00
2011-12-13 21:08:43 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2011-12-30 20:00:53 +01:00
2011-12-23 11:39:41 +01:00
2012-01-22 04:49:46 +01:00
2012-01-11 18:14:13 +01:00
2012-01-14 22:58:19 +01:00
2011-12-13 19:54:31 +01:00
2011-10-19 20:26:55 +02:00
2012-01-28 22:08:21 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-16 19:21:24 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2011-11-12 20:49:53 +01:00