Michael Niedermayer
6101e5322f
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
asfdec: Add an option for not searching for the packet markers
cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
cosmetics: Align codec declarations
cosmetics: Convert mimic.c to utf-8
avconv: remove an unused function parameter.
avconv: remove now pointless variables.
avconv: drop support for building without libavfilter.
nellymoserenc: fix crash due to memsetting the wrong area.
libavformat: Only require first packet to be known for audio/video streams
avplay: Don't try to scale timestamps if the tb isn't set
Conflicts:
Changelog
configure
ffmpeg.c
libavcodec/aacenc.c
libavcodec/bmpenc.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/ffv1.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/libopenjpegdec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/pamenc.c
libavcodec/pgssubdec.c
libavcodec/pngenc.c
libavcodec/qtrleenc.c
libavcodec/rawdec.c
libavcodec/sgienc.c
libavcodec/tiffenc.c
libavcodec/v210dec.c
libavcodec/wmv2dec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-07 22:41:37 +02:00
2012-02-06 20:33:06 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2011-12-03 03:00:30 +01:00
2012-01-31 07:50:31 +01:00
2012-04-06 22:52:01 +02:00
2011-11-12 02:50:25 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-03-25 12:22:06 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-02-25 04:00:43 +01:00
2012-02-10 01:20:07 +01:00
2011-12-31 22:33:58 +01:00
2011-11-05 16:51:25 +01:00
2012-03-29 04:11:10 +02:00
2012-04-07 22:41:37 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-04-01 21:21:13 +02:00
2012-03-25 01:56:53 +01:00
2012-03-25 01:56:53 +01:00
2012-04-04 20:39:33 +02:00
2011-11-28 01:07:11 +01:00
2012-04-01 10:33:16 +02:00
2012-04-06 22:52:01 +02:00
2011-12-19 11:57:34 +01:00
2012-02-06 02:04:08 +01:00
2012-04-04 20:39:33 +02:00
2012-04-04 20:39:33 +02:00
2012-01-28 07:53:34 +01:00
2011-09-08 22:37:31 +02:00
2012-03-03 00:23:10 +01:00
2012-02-17 00:35:06 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-01-29 18:11:39 +01:00
2012-01-28 07:53:34 +01:00
2012-03-03 04:30:49 +01:00
2012-04-06 19:19:59 +03:00
2012-02-16 01:34:37 +01:00
2012-02-06 02:04:09 +01:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2012-04-06 22:52:01 +02:00
2012-01-23 17:18:13 +01:00
2011-05-27 23:48:22 +02:00
2012-04-06 22:52:01 +02:00
2012-03-05 16:27:31 -05:00
2011-12-02 00:51:11 +01:00
2011-12-30 20:00:53 +01:00
2011-11-13 13:14:39 +01:00
2012-02-16 01:34:37 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-03-22 13:15:17 +01:00
2011-08-09 19:56:25 +02:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2011-05-22 04:53:19 +02:00
2012-01-28 07:53:34 +01:00
2011-06-09 04:47:19 +02:00
2011-11-03 02:16:26 +01:00
2012-04-06 22:52:01 +02:00
2011-07-17 20:12:02 +02:00
2012-04-06 22:52:01 +02:00
2011-12-11 01:05:33 +01:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-03-20 07:53:40 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-22 02:24:18 +01:00
2012-01-06 02:45:12 +01:00
2012-01-31 07:50:31 +01:00
2012-03-19 13:33:24 +01:00
2012-03-21 01:33:53 +01:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2012-02-21 05:10:12 +01:00
2012-02-15 01:52:14 +01:00
2012-03-14 02:10:11 +01:00
2011-11-11 02:50:35 +01:00
2012-03-14 02:10:11 +01:00
2012-03-14 02:10:11 +01:00
2012-01-28 07:53:34 +01:00
2011-06-09 04:47:19 +02:00
2012-01-29 00:34:59 +01:00
2012-04-02 00:17:02 +02:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-09-24 22:39:52 +02:00
2012-03-13 01:56:33 +01:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-03-18 23:39:42 +01:00
2012-04-06 22:52:01 +02:00
2012-03-21 01:33:53 +01:00
2012-01-28 07:53:34 +01:00
2012-04-07 22:11:21 +02:00
2012-03-31 12:37:42 +02:00
2012-01-29 00:34:59 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-03-15 01:27:10 +01:00
2011-12-03 03:00:30 +01:00
2012-03-12 06:04:37 +01:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-02-15 01:52:14 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-03-31 12:37:42 +02:00
2011-05-27 23:48:22 +02:00
2012-03-26 20:52:52 +02:00
2011-05-24 23:34:24 +02:00
2012-03-01 03:17:11 +01:00
2012-03-23 01:27:49 +01:00
2012-04-06 22:52:01 +02:00
2012-02-04 02:34:14 +01:00
2011-12-02 00:51:11 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-03-26 20:03:57 +02:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-23 00:50:49 +01:00
2012-03-21 22:19:23 +01:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-03-22 13:56:44 -07:00
2012-02-28 20:48:43 +01:00
2012-04-07 22:11:21 +02:00
2012-04-06 22:52:01 +02:00
2012-03-21 01:33:53 +01:00
2012-02-17 00:35:06 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-02-10 15:27:49 -05:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-07 07:56:55 +02:00
2012-04-06 22:52:01 +02:00
2012-02-29 00:30:35 +01:00
2012-04-06 22:52:01 +02:00
2012-03-09 22:25:32 +01:00
2012-03-10 18:32:02 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-03-10 18:01:03 +01:00
2012-03-11 17:39:52 +01:00
2012-04-04 17:43:17 +02:00
2012-04-03 10:11:27 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-29 00:34:59 +01:00
2012-02-03 19:51:13 +01:00
2012-02-14 01:53:31 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 00:53:09 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-03-09 01:22:31 +01:00
2011-09-26 13:51:29 +02:00
2012-04-01 00:36:43 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2012-03-29 04:11:10 +02:00
2012-03-22 19:51:43 +01:00
2012-03-23 04:29:33 +01:00
2011-11-30 20:34:45 +01:00
2012-03-23 04:29:33 +01:00
2012-03-20 14:39:57 -04:00
2011-12-19 02:34:18 +01:00
2011-12-20 22:38:53 +01:00
2012-03-27 12:52:53 +02:00
2012-02-29 14:26:14 +01:00
2012-04-04 20:39:33 +02:00
2012-03-21 01:33:53 +01:00
2012-02-18 12:26:35 +01:00
2012-02-03 19:51:13 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-09-24 22:39:52 +02:00
2012-02-28 07:20:36 +01:00
2012-03-04 04:26:04 +01:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-03-10 01:12:08 +01:00
2012-04-06 22:52:01 +02:00
2012-02-01 02:36:09 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-03-06 06:03:32 +01:00
2011-07-14 20:44:58 +02:00
2012-04-06 08:32:09 +02:00
2011-11-28 01:07:11 +01:00
2012-02-29 00:30:35 +01:00
2012-03-20 00:03:19 +01:00
2012-03-20 00:03:19 +01:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2011-11-03 02:16:26 +01:00
2012-02-16 01:34:37 +01:00
2011-11-29 00:20:29 +01:00
2011-12-12 01:25:37 +01:00
2011-07-03 03:14:10 +02:00
2012-04-04 21:17:52 +02:00
2012-02-24 02:57:18 +01:00
2012-02-17 00:35:06 +01:00
2012-01-29 00:34:59 +01:00
2012-04-07 22:41:37 +02:00
2012-02-19 01:47:10 +01:00
2011-12-02 00:51:11 +01:00
2012-02-18 17:31:55 +02:00
2012-02-19 01:47:10 +01:00
2012-02-14 01:53:31 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2011-12-13 00:39:48 +01:00
2011-12-01 02:54:24 +01:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2012-03-04 04:26:04 +01:00
2011-12-01 02:54:24 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-03-01 16:08:32 +02:00
2012-02-24 02:57:18 +01:00
2011-12-12 01:25:37 +01:00
2011-06-17 05:49:58 +02:00
2012-01-29 00:34:59 +01:00
2012-04-06 22:52:01 +02:00
2012-03-20 00:03:19 +01:00
2012-02-17 00:35:06 +01:00
2012-03-29 04:11:10 +02:00
2012-01-23 01:05:20 +01:00
2012-03-20 00:03:19 +01:00
2012-03-20 00:03:19 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2011-06-09 04:47:19 +02:00
2012-02-23 16:00:22 +01:00
2012-03-29 04:11:10 +02:00
2012-03-29 04:11:10 +02:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-03-04 04:26:04 +01:00
2012-03-22 13:43:26 +01:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-03-08 02:51:45 +01:00
2012-01-17 02:37:30 +01:00
2012-01-16 11:29:55 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-12-12 01:25:37 +01:00
2011-05-22 04:53:19 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-04-03 19:12:52 +02:00
2012-04-03 19:12:52 +02:00
2012-03-06 06:03:32 +01:00
2012-03-29 04:11:10 +02:00
2012-03-04 04:26:04 +01:00
2012-03-04 04:26:04 +01:00
2012-01-05 23:56:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-29 04:11:10 +02:00
2012-03-20 00:03:19 +01:00
2012-04-07 22:41:37 +02:00
2012-04-06 22:52:01 +02:00
2011-12-30 20:00:53 +01:00
2012-03-25 12:22:06 +02:00
2012-02-16 01:34:37 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2011-06-09 04:47:19 +02:00
2011-12-13 00:39:48 +01:00
2012-03-04 04:26:04 +01:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-02-01 04:43:06 +01:00
2012-03-27 11:58:15 -04:00
2012-01-27 10:51:57 +01:00
2011-09-08 01:55:07 +02:00
2012-01-28 07:53:34 +01:00
2011-12-03 03:24:32 +01:00
2012-02-10 01:20:07 +01:00
2012-03-21 01:33:53 +01:00
2012-03-23 10:31:45 +01:00
2012-03-22 23:16:49 +01:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
6101e5322f