Michael Niedermayer
406cdddbdd
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
libx264: add forgotten ;
matroskadec: fix a sanity check.
matroskadec: only return corrupt packets that actually contain data
lavf: zero data/size of the packet passed to read_packet().
ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
ARM: align PIC offset pools to 4 bytes
ARM: swap source operands in some add instructions
configure: update tms470 detection for latest version
lavf probe: prevent codec probe with no data at all seen
motion_est: fix use of inline on extern functions
Conflicts:
libavcodec/motion_est_template.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-21 14:44:32 +02:00
2012-09-09 03:55:56 +02:00
2012-09-21 14:44:32 +02:00
2012-09-09 03:55:56 +02:00
2012-09-09 03:55:56 +02:00
2012-09-18 16:15:17 +02:00
2012-09-15 03:50:04 +02:00
2012-09-15 03:50:04 +02:00
2012-09-14 03:27:25 +02:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2012-09-18 15:45:20 +02:00
2012-09-18 15:06:43 +02:00
2012-09-16 03:05:01 +02:00
2012-09-16 03:05:01 +02:00
2012-09-09 14:19:02 +02:00
2012-09-18 14:45:44 +02:00
2012-09-10 22:32:56 +02:00
2012-09-21 01:03:31 +02:00
2012-09-21 01:03:31 +02:00
2012-09-19 15:13:53 +02:00
2012-09-15 04:06:32 +02:00
2012-09-10 14:06:20 +02:00
2012-09-16 14:55:00 +02:00
2012-09-11 07:13:49 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-09-19 23:29:37 +02:00
2012-09-14 14:13:38 +02:00
2012-09-17 15:00:40 -04:00
2012-09-09 03:55:56 +02:00
2012-09-09 17:21:37 +02:00
2012-09-18 05:27:23 +02:00
2012-09-13 15:35:50 +02:00
2012-09-18 14:45:44 +02:00
2012-09-18 14:45:44 +02:00
2012-09-20 05:38:53 +02:00
2012-09-16 14:55:00 +02:00
2012-09-16 14:55:00 +02:00
2012-09-08 05:36:34 +02:00
2012-09-11 01:15:10 +02:00
2012-09-20 04:38:46 +02:00
2012-09-09 13:02:08 +02:00
2012-09-20 02:13:52 +02:00
2012-09-20 02:13:52 +02:00
2012-09-21 14:44:32 +02:00
2012-09-14 23:04:38 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 14:06:20 +02:00
2012-09-13 15:35:50 +02:00
2012-09-21 14:44:32 +02:00
2012-09-21 14:44:32 +02:00
2012-09-18 14:45:44 +02:00
2012-09-20 03:20:29 +02:00
2012-09-10 14:06:20 +02:00
2012-09-14 05:55:11 +02:00
2012-09-10 22:34:18 +02:00
2012-09-13 22:44:42 +02:00
2012-09-11 17:50:14 +02:00
2012-09-16 14:55:00 +02:00
2012-09-20 03:20:29 +02:00
2012-09-20 03:20:29 +02:00
2012-09-16 14:55:00 +02:00
2012-09-10 17:08:18 +02:00
2012-09-11 17:50:14 +02:00
2012-09-15 16:14:33 +02:00
2012-09-15 22:13:21 +02:00
2012-09-10 15:15:40 +02:00
2012-09-14 06:36:55 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 21:04:01 +02:00
2012-09-11 17:50:14 +02:00
2012-09-14 23:04:38 +02:00
2012-09-19 15:30:34 +02:00
2012-09-18 17:37:41 +02:00
2012-09-09 14:19:02 +02:00
2012-09-18 14:45:44 +02:00
2012-09-18 10:45:09 +02:00
2012-09-19 11:05:36 -07:00
2012-09-20 03:20:29 +02:00
2012-09-19 15:13:53 +02:00
2012-09-12 11:46:47 +02:00
2012-09-12 21:12:18 +02:00
2012-09-12 21:12:18 +02:00
2012-09-16 16:43:27 +02:00
2012-09-21 01:03:31 +02:00
2012-09-15 10:35:26 +02:00
2012-09-15 20:26:35 +02:00
2012-09-15 20:26:47 +02:00
2012-09-15 20:26:52 +02:00
2012-09-15 20:26:47 +02:00
2012-09-19 18:33:30 +02:00
2012-09-18 14:45:44 +02:00
406cdddbdd