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
2012-01-29 00:34:59 +01:00
2012-01-08 03:34:22 +01:00
2012-01-31 02:46:26 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-13 16:22:25 +01:00
2012-01-10 03:50:41 +01:00
2012-01-24 02:41:53 +01:00
2012-01-13 01:29:48 +01:00
2012-01-31 02:46:26 +01:00
2012-01-24 02:41:53 +01:00
2012-01-10 03:50:41 +01:00
2012-01-24 02:41:53 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-21 05:29:47 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 20:13:38 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 22:53:59 +01:00
2012-01-28 21:20:42 +01:00
2012-01-28 20:14:20 +01:00
2012-01-14 01:17:06 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-06 02:45:12 +01:00
2012-01-30 23:28:26 +01:00
2012-01-30 23:28:36 +01:00
2012-01-17 20:16:35 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-14 17:23:57 +01:00
2012-01-11 02:44:43 +01:00
2012-01-09 00:32:38 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 16:32:55 +01:00
2012-01-11 21:29:25 +01:00
2012-01-15 01:16:54 +01:00
2012-01-14 04:51:13 +01:00
2012-01-14 04:47:27 +01:00
2012-01-14 02:22:09 +01:00
2012-01-08 03:34:22 +01:00
2012-01-08 03:34:22 +01:00
2012-01-22 23:40:24 +01:00
2012-01-29 00:34:59 +01:00
2012-01-08 00:18:36 +01:00
2012-01-28 21:59:01 +01:00
2012-01-30 20:35:09 +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
2012-01-17 01:37:59 +01:00
2012-01-29 08:11:18 -08:00
2012-01-29 08:11:18 -08:00
2012-01-29 14:52:56 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 22:01:05 +01:00
2012-01-17 20:16:35 +01:00
2012-01-24 21:08:41 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-07 02:30:27 +01:00
2012-01-29 21:52:55 +01:00
2012-01-28 07:53:34 +01:00
2012-01-15 01:16:54 +01:00
2012-01-07 13:38:23 -05:00
2012-01-28 07:53:34 +01:00
2012-01-11 08:56:24 -05:00
2012-01-11 08:56:24 -05:00
2012-01-12 01:10:32 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-25 06:48:30 +01:00
2012-01-14 02:22:09 +01:00
2012-01-29 00:34:59 +01:00
2012-01-15 01:16:54 +01:00
2012-01-29 00:34:59 +01:00
2012-01-07 02:30:27 +01:00
2012-01-26 19:54:38 +01:00
2012-01-28 07:53:34 +01:00
2012-01-30 18:39:08 +01:00
2012-01-29 00:34:59 +01: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
2012-01-12 13:54:41 +01:00
2012-01-12 13:54:41 +01:00
2012-01-26 02:23:56 +01:00
2012-01-29 00:34:59 +01:00
2012-01-17 02:37:30 +01:00
2012-01-08 03:34:22 +01:00
2012-01-08 03:34:22 +01:00
2012-01-13 19:51:19 +01:00
2012-01-12 16:32:55 +01:00
2012-01-08 00:18:36 +01:00
2012-01-29 00:34:59 +01:00
2012-01-30 10:16:23 -08:00
2012-01-31 02:46:26 +01:00
2012-01-28 07:53:34 +01:00
2012-01-08 03:34:22 +01:00
2012-01-25 03:51:49 +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
2012-01-30 23:53:25 +01:00
2012-01-19 23:31:22 +01:00
2012-01-08 03:34:22 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 18:11:40 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-08 03:34:22 +01:00
2012-01-29 00:34:59 +01:00
2012-01-30 05:20:58 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-18 22:04:14 +01:00
2012-01-07 00:11:43 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-06 00:51:31 +01:00
2012-01-12 16:32:55 +01:00
2012-01-29 00:34:59 +01:00
2012-01-26 02:23:56 +01:00
2012-01-31 02:46:26 +01:00
2012-01-18 21:22:01 +01:00
2012-01-07 02:30:27 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-31 02:46:26 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-01-21 23:11:27 +01:00
2012-01-28 07:53:34 +01:00
2012-01-24 15:36:38 +01:00
2012-01-12 01:10:32 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-27 17:19:09 -08:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-22 16:38:20 +01:00
2012-01-16 20:32:16 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 22:08:20 +01:00
2012-01-30 11:25:59 +01:00
2012-01-17 02:37:30 +01:00
2012-01-22 00:46:19 +01:00
2012-01-30 05:20:58 +01:00
2012-01-31 00:13:24 +01:00
2012-01-30 05:20:58 +01:00
2012-01-29 08:11:18 -08:00
2012-01-15 22:04:25 +01:00
2012-01-23 01:05:20 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 02:41:53 +01:00
2012-01-23 19:47:49 +01:00
2012-01-26 22:28:25 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 11:04:19 +01:00
2012-01-28 22:08:20 +01:00
2012-01-29 21:00:19 +01:00
2012-01-22 06:46:24 +01:00
2012-01-29 00:34:59 +01:00
2012-01-06 00:59:08 +01:00
2012-01-12 17:02:13 +01:00
2012-01-28 23:21:03 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 22:08:21 +01:00
2012-01-26 02:23:56 +01:00
2012-01-11 02:44:43 +01:00
2012-01-17 02:37:30 +01:00
2012-01-11 02:44:43 +01:00
2012-01-13 01:29:48 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2012-01-11 02:44:43 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 14:56:18 +00:00
2012-01-28 14:56:18 +00:00
2012-01-29 00:34:59 +01:00
2012-01-19 23:31:22 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-26 20:05:15 +01:00
2012-01-30 05:20:58 +01:00
2012-01-28 01:36:42 +01:00
2012-01-22 04:49:46 +01:00
2012-01-11 11:15:05 +01:00
2012-01-28 07:53:34 +01:00
2012-01-11 18:14:13 +01:00
2012-01-14 22:58:19 +01:00
2012-01-18 22:04:14 +01:00
2012-01-29 00:34:59 +01:00
2012-01-18 02:08:12 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 22:08:21 +01:00
2012-01-28 22:08:21 +01:00
2012-01-28 22:08:21 +01:00
2012-01-12 18:18:23 +01:00
2012-01-12 18:18:23 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 18:18:23 +01:00
2012-01-07 02:30:27 +01:00
2012-01-27 02:09:58 +01:00
2012-01-28 07:53:34 +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-30 11:25:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-07 02:30:27 +01:00
2012-01-29 00:34:59 +01:00
2012-01-25 21:12:00 +01:00
2012-01-16 19:21:24 +01:00
2012-01-08 03:34:22 +01:00
2012-01-29 17:50:17 +01:00
2012-01-29 00:34:59 +01:00
2012-01-31 02:46:26 +01:00
2012-01-19 08:51:56 +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
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-08 03:34:22 +01:00
151ecc2aec