Michael Niedermayer
8e2bab5d4b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
drawtext: remove typo
pcm-mpeg: implement new audio decoding api
w32thread: port fixes to pthread_cond_broadcast() from x264.
doc: add editor configuration section with Vim and Emacs settings
dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
avformat/utils: Drop unused goto label.
doxygen: Replace '\' by '@' in Doxygen markup tags.
cosmetics: drop some completely pointless parentheses
cljr: simplify CLJRContext
drawtext: introduce rand(min, max)
drawtext: introduce explicit draw/hide variable
rtmp: Use nb_invokes for all invoke commands
Conflicts:
libavcodec/mpegvideo.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 00:23:37 +01:00
..
2011-11-03 19:25:26 +01:00
2011-07-05 02:26:17 +02:00
2011-09-16 20:44:27 +02:00
2011-11-24 03:32:24 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-18 19:39:26 +01:00
2011-11-06 00:05:14 +01:00
2011-09-16 00:46:41 +02:00
2011-12-04 21:18:37 +01:00
2011-11-06 00:05:14 +01:00
2011-11-24 03:32:24 +01:00
2011-08-21 11:37:57 +02:00
2011-12-04 21:13:22 +01:00
2011-11-26 01:12:08 +01:00
2011-06-12 22:46:02 +02:00
2011-06-12 22:46:02 +02:00
2011-11-26 01:12:08 +01:00
2011-12-04 21:18:37 +01:00
2011-09-28 08:02:53 +02:00
2011-11-22 15:09:26 +01:00
2011-09-06 18:51:09 +02:00
2011-11-30 18:53:47 +01:00
2011-10-28 02:06:50 +02:00
2011-10-28 02:06:50 +02:00
2011-11-23 14:14:01 +01:00
2011-05-17 03:05:36 +02:00
2011-09-28 08:02:53 +02:00
2011-10-17 18:05:38 +02:00
2010-01-16 04:49:02 +00:00
2011-12-04 21:18:37 +01:00
2011-11-06 00:05:14 +01:00
2011-11-15 00:10:15 +01:00
2011-10-04 08:04:17 +02:00
2011-10-20 15:59:20 +02:00
2011-11-06 00:05:14 +01:00
2011-11-26 10:42:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-25 04:45:41 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-08 00:23:37 +01:00
2011-11-10 01:31:28 +01:00
2011-11-06 00:05:14 +01:00
2011-11-21 19:35:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-23 13:22:46 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-14 05:42:10 +01:00
2011-11-06 00:05:14 +01:00
2011-12-06 15:03:51 +01:00
2011-11-16 07:48:23 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-11 17:06:47 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-09-19 12:43:10 +02:00
2011-11-06 00:05:14 +01:00
2011-12-06 15:03:51 +01:00
2011-11-24 00:08:05 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-04-03 08:46:19 +02:00