Michael Niedermayer
7f92f3d812
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
h264: fix frame reordering code.
fate: Add a test for the VBLE decoder
doc: break some long lines in developer.texi
drawtext: make x and y parametric
drawtext: manage memory allocation better
drawtext: refactor draw_text
doc: remove space between variable and post increment in example code
Conflicts:
doc/developer.texi
doc/filters.texi
libavcodec/h264.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 01:02:37 +01:00
2011-11-09 01:58:22 +01:00
2011-11-09 01:58:22 +01:00
2011-04-12 19:06:26 -04:00
2011-09-11 17:44:20 +02:00
2010-08-21 20:57:24 +00:00
2011-11-09 01:58:22 +01:00
2011-06-30 09:47:32 +01:00
2011-11-23 21:58:30 +01:00
2011-04-12 19:06:26 -04:00
2011-02-25 15:24:35 -05:00
2011-11-23 21:58:10 +01:00
2011-04-12 19:06:26 -04:00
2011-07-03 17:17:54 +01:00
2011-11-12 20:47:33 +01:00
2011-09-16 21:29:58 +02:00
2011-09-11 17:44:20 +02:00
2011-11-23 21:43:46 +01:00
2011-10-14 15:53:41 -04:00
2010-08-31 11:11:25 +00:00
2011-09-23 00:35:31 +02:00
2010-08-28 11:46:03 +00:00
2010-08-28 11:46:03 +00:00
2011-08-17 20:00:06 +02:00
2011-08-26 20:54:36 +02:00
2011-11-23 21:43:46 +01:00
2011-11-13 14:50:01 +01:00
2011-11-13 14:50:01 +01:00
2011-11-09 00:06:08 +01:00
2010-09-11 10:23:02 +00:00
2011-10-18 10:45:22 +03:00
2011-09-30 00:13:26 +02:00
2011-09-30 00:13:26 +02:00
2010-10-02 09:56:21 +00:00
2010-10-02 09:56:21 +00:00
2010-11-29 10:35:57 +00:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-23 08:44:31 -04:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-01-24 22:26:13 +00:00
2010-11-04 21:48:54 +00:00
2011-01-22 03:08:21 +00:00
2011-04-12 19:06:26 -04:00
2011-05-17 00:58:33 +02:00
2011-07-04 16:26:26 +01:00
2011-04-12 19:06:26 -04:00
2011-11-09 01:58:22 +01:00
2011-08-17 20:00:06 +02:00
2011-10-20 13:09:46 -04:00
2011-11-04 19:40:32 +01:00
2011-11-04 19:40:32 +01:00
2011-11-04 19:40:32 +01:00
2011-07-03 18:19:18 +01:00
2010-08-31 11:13:14 +00:00
2011-11-09 01:58:22 +01:00
2011-11-23 21:43:46 +01:00
2010-07-17 10:50:25 +00:00
2011-11-09 01:58:22 +01:00
2011-11-09 01:58:22 +01:00
2011-11-24 03:32:24 +01:00
2011-11-13 14:52:21 +01:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 21:34:20 +02:00
2011-10-15 14:59:44 +01:00
2011-04-12 19:06:26 -04:00
2011-03-26 16:39:22 -04:00
2011-03-26 16:39:22 -04:00
2011-11-09 01:58:22 +01:00
2011-09-23 20:54:28 -04:00
2011-09-23 20:54:28 -04:00
2011-11-09 01:58:22 +01:00
2011-09-13 17:29:23 +02:00
2011-08-17 20:00:06 +02:00
2011-11-09 01:58:22 +01:00
2011-08-17 15:00:42 +02:00
2010-08-31 20:07:38 +00:00
2011-04-12 19:06:26 -04:00
2011-04-12 19:06:26 -04:00
2011-09-14 11:13:54 +03:00
2011-01-14 22:32:26 +00:00
2010-12-28 23:52:53 +00:00
2011-11-23 21:43:46 +01:00
2011-11-09 01:58:22 +01:00
2011-10-16 04:02:09 +02:00
2011-11-09 01:58:22 +01:00
2011-11-23 21:43:46 +01:00
2010-08-24 20:48:58 +00:00
2010-08-24 20:48:58 +00:00
2011-09-07 12:16:15 +02:00
2011-12-03 01:50:07 +01:00
2011-05-04 07:40:53 -04:00
2011-11-09 01:58:22 +01:00
2011-11-23 21:43:46 +01:00
2010-08-25 17:23:38 +00:00
2011-09-11 17:44:20 +02:00
2011-09-13 17:29:23 +02:00
2011-11-13 15:12:43 +01:00
2011-11-23 21:43:46 +01:00
2011-04-12 19:06:26 -04:00
2010-08-28 14:51:51 +00:00
2011-11-12 20:49:53 +01:00
2011-09-11 17:44:20 +02:00
7f92f3d812