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-05-05 22:04:21 +01:00
2012-06-08 13:14:38 -04:00
2012-06-08 13:14:38 -04:00
2012-09-20 17:07:18 +01:00
2012-04-22 22:26:42 +02:00
2012-06-08 23:59:09 +02:00
2011-10-24 01:01:21 +02:00
2012-09-16 19:06:11 +02:00
2012-04-22 22:26:42 +02:00
2012-06-08 23:59:09 +02:00
2012-03-13 01:56:33 +01:00
2012-09-21 14:44:32 +02:00
2012-06-08 23:59:09 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-09-09 03:55:56 +02:00
2012-07-18 22:34:48 +02:00
2012-06-08 23:59:09 +02:00
2012-06-19 20:53:27 +02:00
2012-06-08 23:59:09 +02:00
2012-07-19 18:44:46 +02:00
2012-07-01 22:43:09 +02:00
2012-04-22 22:26:42 +02:00
2012-07-01 22:43:09 +02:00
2012-09-16 14:55:00 +02:00
2012-09-16 14:55:00 +02:00
2012-04-22 22:26:42 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-08-01 10:32:24 +01:00
2012-08-07 13:31:40 +02:00
2012-08-01 23:33:06 +02:00
2012-06-08 23:59:09 +02:00
2012-08-07 22:45:46 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 13:14:38 -04:00
2012-09-15 23:54:21 +01:00
2012-06-08 13:14:38 -04:00
2012-06-08 23:59:09 +02:00
2012-06-08 13:14:38 -04:00
2012-04-22 12:30:45 +01:00
2012-04-22 22:26:42 +02:00
2012-03-13 01:56:33 +01:00
2012-08-01 23:33:06 +02:00
2012-02-16 01:34:37 +01:00
2012-06-08 23:59:09 +02:00
2011-12-02 19:59:18 +00:00
2012-06-08 23:59:09 +02:00
2012-02-20 14:58:25 -08:00
2012-06-08 13:14:38 -04:00
2012-04-10 10:06:48 -07:00
2012-06-08 13:14:38 -04:00
2012-04-22 12:30:45 +01:00
2012-07-01 11:25:06 +01:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-06-08 23:59:09 +02:00
2012-07-18 22:34:48 +02:00
2012-07-18 22:34:48 +02:00
2012-09-21 14:44:32 +02:00
2012-02-10 01:20:07 +01:00
2012-08-04 00:59:14 +01:00
2012-04-26 22:24:58 +02:00
2012-04-25 21:41:39 +01:00
2012-04-25 21:41:39 +01:00
2012-06-08 23:59:09 +02:00
2012-04-25 21:41:39 +01:00
2012-08-04 23:51:43 +02:00
2012-08-07 22:45:46 +02:00
2012-06-08 23:59:09 +02:00
406cdddbdd