Michael Niedermayer
7c29313b38
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
APIchanges: fill in revision for AVFrame.age deprecation
avcodec: deprecate AVFrame.age
4xm: remove unneeded check for remaining unused data.
lavf: force threads to 1 in avformat_find_stream_info()
swscale: fix overflows in vertical scaling at top/bottom edges.
lavf: add OpenMG audio muxer.
omadec: split data that will be used in the muxer to a separate file.
lavf: rename oma.c -> omadec.c
tmv decoder: set correct pix_fmt
Conflicts:
Changelog
doc/APIchanges
libavcodec/mpegvideo.c
libavcodec/version.h
libavformat/oma.c
libavformat/version.h
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-19 02:34:18 +01:00
..
2011-12-17 02:18:16 +01:00
2011-12-08 00:23:37 +01:00
2011-12-14 23:58:10 +01:00
2011-12-19 02:34:18 +01:00
2011-12-06 23:06:27 +01:00
2011-12-13 23:07:40 +01:00
2011-12-13 23:21:37 +01:00
2011-12-13 00:39:48 +01:00
2011-12-15 03:59:29 +01:00
2011-12-13 15:45:04 +01:00
2011-12-14 00:39:58 +01:00
2011-12-18 14:22:13 +01:00
2011-12-18 03:04:44 +01:00
2011-12-05 00:11:57 +01:00
2011-12-18 20:51:40 +01:00
2011-12-18 20:49:34 +01:00
2011-12-15 18:38:04 +01:00
2011-12-06 01:37:27 +01:00
2011-12-13 00:39:48 +01:00
2011-12-17 03:18:58 +01:00
2011-12-19 02:34:18 +01:00
2011-12-12 01:25:37 +01:00
2011-12-12 01:25:37 +01:00
2011-12-15 19:23:07 +01:00
2011-12-13 00:39:48 +01:00
2011-12-13 00:39:48 +01:00
2011-12-06 01:37:27 +01:00
2011-12-16 20:23:38 +01:00
2011-12-13 00:39:48 +01:00
2011-12-10 05:02:00 +01:00
2011-12-18 03:04:44 +01:00
2011-12-14 23:17:59 +01:00
2011-12-16 20:34:34 +01:00
2011-12-13 00:39:48 +01:00
2011-12-11 00:32:25 +01:00
2011-12-17 02:18:16 +01:00
2011-12-10 11:58:03 +01:00
2011-12-08 00:23:37 +01:00
2011-12-06 01:37:27 +01:00
2011-12-12 01:25:37 +01:00
2011-12-13 23:21:37 +01:00
2011-12-08 18:31:32 +01:00
2011-12-09 00:05:51 +01:00
2011-12-15 18:38:04 +01:00
2011-12-15 04:42:13 +01:00
2011-12-05 12:41:23 +02:00
2011-12-05 12:41:23 +02:00
2011-12-11 00:32:25 +01:00
2011-12-18 03:04:44 +01:00
2011-12-08 02:48:31 +01:00
2011-12-14 23:58:10 +01:00
2011-12-13 00:39:48 +01:00
2011-12-18 03:19:40 +01:00
2011-12-18 03:17:44 +01:00
2011-12-18 03:17:44 +01:00
2011-12-17 04:42:04 +01:00
2011-12-18 03:17:44 +01:00
2011-12-15 02:43:03 +01:00
2011-12-10 18:51:48 +01:00
2011-12-18 03:17:44 +01:00
2011-12-13 23:21:37 +01:00
2011-12-12 01:25:37 +01:00
2011-12-17 02:18:16 +01:00
2011-12-15 01:30:38 +01:00
2011-12-19 02:34:18 +01:00
2011-12-13 23:21:37 +01:00
2011-12-18 03:19:40 +01:00
2011-12-13 00:39:48 +01:00
2011-12-06 01:37:27 +01:00
2011-12-16 04:16:01 +01:00
2011-12-11 00:32:25 +01:00
2011-12-18 01:20:18 +01:00
2011-12-13 00:39:48 +01:00
2011-12-16 02:33:25 +01:00
2011-12-16 01:23:15 +01:00
2011-12-08 02:01:21 +01:00
2011-12-12 17:49:33 +01:00
2011-12-12 01:25:37 +01:00
2011-12-06 01:37:27 +01:00
2011-12-15 18:38:04 +01:00
2011-12-13 00:39:48 +01:00
2011-12-15 15:23:38 +01:00
2011-12-10 05:02:00 +01:00
2011-12-10 02:11:24 +01:00
2011-12-18 15:28:18 +01:00
2011-12-17 20:25:13 +01:00
2011-12-09 00:05:51 +01:00
2011-12-17 05:04:56 +01:00
2011-12-18 03:23:28 +01:00
2011-12-13 00:39:48 +01:00
2011-12-13 01:26:14 +01:00
2011-12-18 03:23:28 +01:00
2011-12-13 00:39:48 +01:00
2011-12-18 03:35:46 +01:00
2011-12-14 16:20:51 +01:00
2011-12-18 03:04:44 +01:00
2011-12-13 00:39:48 +01:00
2011-12-14 23:58:10 +01:00
2011-12-19 02:34:18 +01:00
2011-12-19 02:34:18 +01:00
2011-12-18 03:04:44 +01:00
2011-12-13 15:46:23 +01:00
2011-12-17 23:25:59 +01:00
2011-12-05 03:22:06 +01:00
2011-12-13 00:39:48 +01:00
2011-12-08 00:23:37 +01:00
2011-12-07 11:31:27 +01:00
2011-12-18 02:09:17 +01:00
2011-12-17 02:18:16 +01:00
2011-12-13 21:08:43 +01:00
2011-12-19 02:34:18 +01:00
2011-12-11 01:05:33 +01:00
2011-12-06 01:37:27 +01:00
2011-12-07 21:11:51 +01:00
2011-12-13 20:01:49 +01:00
2011-12-13 00:39:48 +01:00
2011-12-04 16:04:27 +01:00
2011-12-06 01:37:27 +01:00
2011-12-13 23:21:37 +01:00
2011-12-13 21:08:43 +01:00
2011-12-13 23:21:37 +01:00
2011-12-13 12:05:34 +00:00
2011-12-14 11:26:30 +00:00
2011-12-14 23:58:10 +01:00
2011-12-14 23:58:10 +01:00
2011-12-09 00:05:51 +01:00
2011-12-15 22:52:57 +01:00
2011-12-18 01:20:18 +01:00
2011-12-08 00:23:37 +01:00
2011-12-13 00:39:48 +01:00
2011-12-12 17:49:34 +01:00
2011-12-12 17:49:34 +01:00
2011-12-19 02:34:18 +01:00
2011-12-12 01:25:37 +01:00
2011-12-18 01:20:18 +01:00
2011-12-13 19:54:31 +01:00
2011-12-13 23:21:37 +01:00
2011-12-19 02:34:18 +01:00
2011-12-18 01:20:18 +01:00
2011-12-18 01:20:18 +01:00
2011-12-14 03:38:57 +01:00
2011-12-16 01:23:15 +01:00
2011-12-12 01:25:37 +01:00
2011-12-09 23:46:16 +01:00
2011-12-13 00:39:48 +01:00
2011-12-14 23:58:10 +01:00
2011-12-12 01:25:37 +01:00
2011-12-13 00:39:48 +01:00
2011-12-19 02:34:18 +01:00
2011-12-07 10:30:54 -08:00
2011-12-17 02:18:16 +01:00
2011-12-08 18:44:46 +01:00
2011-12-12 01:25:37 +01:00
2011-12-18 03:04:44 +01:00
2011-12-05 00:11:57 +01:00
2011-12-05 00:11:57 +01:00