Michael Niedermayer
5c2fc3bdd7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: formatting cosmetics
h264: use mbaff ref indices in fill_colmap() only for mbaff references
Conflicts:
libavcodec/h264_direct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 15:00:05 +01:00
..
2012-12-13 13:51:05 +01:00
2012-12-12 10:37:52 +01:00
2012-12-12 13:22:10 -08:00
2012-12-17 01:35:14 +01:00
2012-12-12 17:46:05 +01:00
2012-12-17 20:37:54 +11:00
2012-12-13 13:59:15 +01:00
2012-12-14 18:10:35 +01:00
2012-12-13 11:53:15 +01:00
2012-12-17 20:37:54 +11:00
2012-12-13 14:32:58 +01:00
2012-12-17 20:37:54 +11:00
2012-12-14 23:37:44 +01:00
2012-12-15 16:04:49 +01:00
2012-12-14 20:58:01 +01:00
2012-12-12 09:55:56 +01:00
2012-12-15 00:19:52 +01:00
2012-12-14 01:13:21 +01:00
2012-12-18 14:27:59 +01:00
2012-12-18 02:47:34 +01:00
2012-12-18 15:00:05 +01:00
2012-12-15 19:16:39 +01:00
2012-12-18 14:52:44 +01:00
2012-12-18 14:52:44 +01:00
2012-12-11 20:17:30 +11:00
2012-12-10 23:23:27 +01:00
2012-12-14 16:05:12 +01:00
2012-12-14 15:56:56 +01:00
2012-12-17 20:37:54 +11:00
2012-12-18 01:21:48 +01:00
2012-12-12 19:29:32 +01:00
2012-12-14 21:50:43 +01:00
2012-12-16 15:05:31 +01:00
2012-12-14 15:36:37 +01:00
2012-12-14 15:36:37 +01:00
2012-12-12 17:46:05 +01:00
2012-12-18 01:58:17 +01:00
2012-12-14 00:31:18 +01:00
2012-12-18 14:27:59 +01:00
2012-12-15 11:46:30 +01:00
2012-12-18 02:47:34 +01:00
2012-12-17 20:37:54 +11:00
2012-12-13 14:26:03 +01:00
2012-12-13 11:53:15 +01:00
2012-12-13 14:20:24 +01:00
2012-12-11 12:50:34 +01:00
2012-12-15 11:46:30 +01:00
2012-12-18 02:47:34 +01:00
2012-12-15 11:46:30 +01:00
2012-12-15 13:41:06 +01:00
2012-12-15 13:41:06 +01:00
2012-12-15 13:41:06 +01:00
2012-12-15 13:41:06 +01:00
2012-12-10 11:19:42 -05:00