Michael Niedermayer
4a519b6e03
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
mov: Use defines for sample flags in fragments
mov: Use defines for trun flags
mov: Use defines for tfhd flags
proresenc: force bitrate not to exceed given limit
vc1parse: call vc1_init_common().
wma: don't return 0 on invalid packets.
asf: prevent packet_size_left from going negative if hdrlen > pktlen.
mjpegb: don't return 0 at the end of frame decoding.
rtpdec: Identify incorrectly signalled H263
vp8dsp: split long line.
aiff: don't skip block_align==0 check on COMM-after-SSND files.
dpcm: ignore extra unpaired bytes in stereo streams.
mp3on4: require a minimum framesize.
mpc7: assign an error level + context to av_log() msg.
huffyuv: error out on bit overrun.
dct-test: Add the missing ff_ prefix to the altivec functions
dct-test: Remove a stray declaration of a nonexistent function
movenc: Write the unknown duration as 64 bit fields in ismv
movenc: Write track durations with all bits set if duration is unknown
Conflicts:
libavcodec/dct-test.c
libavcodec/wmadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 21:36:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-13 16:22:25 +01:00
2012-02-11 01:22:22 +01:00
2012-01-24 02:41:53 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-01-24 02:41:53 +01:00
2012-01-10 03:50:41 +01:00
2012-01-24 02:41:53 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-09 16:36:02 -08:00
2012-02-16 01:34:37 +01:00
2012-02-02 02:24:09 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 22:53:59 +01:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 20:14:20 +01:00
2012-01-14 01:17:06 +01:00
2012-02-12 01:06:13 +01:00
2012-02-18 02:20:19 +01:00
2012-02-17 12:35:08 -08:00
2012-01-29 00:34:59 +01:00
2012-02-11 08:23:42 +01:00
2012-02-16 01:34:37 +01:00
2012-01-30 23:28:26 +01:00
2012-01-30 23:28:36 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-02-15 01:52:14 +01:00
2012-01-14 17:23:57 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 16:32:55 +01:00
2012-02-13 02:06:44 +01:00
2012-02-10 01:20:07 +01:00
2012-01-14 04:51:13 +01:00
2012-01-14 04:47:27 +01:00
2012-01-14 02:22:09 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-13 02:06:44 +01:00
2012-02-18 02:20:19 +01:00
2012-01-22 23:40:24 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-01-28 21:59:01 +01:00
2012-02-16 23:01:47 +01:00
2012-02-16 03:05:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-01-14 01:15:42 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-01-29 14:52:56 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-09 19:16:15 -08:00
2012-02-05 02:08:03 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-10 01:20:07 +01:00
2012-01-28 22:01:05 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-07 01:40:29 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-02 18:44:52 +01:00
2012-01-15 01:16:54 +01:00
2012-01-28 07:53:34 +01:00
2012-02-16 23:25:51 +01:00
2012-02-16 01:34:37 +01:00
2012-02-02 02:24:09 +01:00
2012-02-18 02:20:19 +01:00
2012-01-11 08:56:24 -05:00
2012-02-01 04:43:06 +01:00
2012-01-12 01:10:32 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-01-15 01:16:54 +01:00
2012-01-29 00:34:59 +01:00
2012-01-26 19:54:38 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-01-29 00:34:59 +01:00
2012-02-14 01:22:38 +01:00
2012-02-16 01:34:37 +01:00
2012-02-09 01:27:12 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 13:54:41 +01:00
2012-01-12 13:54:41 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-13 19:51:19 +01:00
2012-01-12 16:32:55 +01:00
2012-02-15 22:06:38 +02:00
2012-02-06 19:39:24 +01:00
2012-02-14 01:22:38 +01:00
2012-02-14 01:22:38 +01:00
2012-02-15 22:06:46 +02:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-01-30 10:16:23 -08:00
2012-01-31 02:46:26 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 07:26:31 +01:00
2012-01-25 03:51:49 +01:00
2012-01-28 23:21:03 +01:00
2012-01-28 22:08:20 +01:00
2012-01-28 22:08:20 +01:00
2012-02-01 15:51:18 +01:00
2012-01-19 23:31:22 +01:00
2012-01-28 07:53:34 +01:00
2012-02-09 23:55:33 +01:00
2012-02-07 18:28:00 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 18:11:40 +01:00
2012-02-18 02:31:38 +01:00
2012-01-29 00:34:59 +01:00
2012-02-04 05:18:45 +01:00
2012-02-16 01:34:37 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-01-29 00:34:59 +01:00
2012-02-18 02:20:19 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-01-26 02:23:56 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-31 02:46:26 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-02-19 01:47:10 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 01:10:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 01:10:32 +01:00
2012-02-14 01:53:31 +01:00
2012-01-29 00:34:59 +01:00
2012-01-27 17:19:09 -08:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-18 02:20:19 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-01-29 00:34:59 +01:00
2012-02-07 15:48:33 +01:00
2012-01-30 11:25:59 +01:00
2012-01-17 02:37:30 +01:00
2012-01-22 00:46:19 +01:00
2012-01-30 05:20:58 +01:00
2012-01-31 21:40:53 +01:00
2012-01-30 05:20:58 +01:00
2012-02-10 23:18:52 +01:00
2012-02-18 02:20:19 +01:00
2012-01-23 01:05:20 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2012-02-15 07:14:45 +01:00
2012-02-15 07:14:45 +01:00
2012-02-16 19:55:16 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 16:49:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 00:37:17 +01:00
2012-02-19 01:47:10 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 02:41:53 +01:00
2012-02-12 20:24:29 +01:00
2012-01-26 22:28:25 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 20:11:33 +01:00
2012-01-28 22:08:20 +01:00
2012-02-17 22:38:30 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-01-22 06:46:24 +01:00
2012-01-29 00:34:59 +01:00
2012-02-09 23:25:46 +01:00
2012-02-09 01:27:12 +01:00
2012-02-10 01:20:07 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 22:08:21 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 19:03:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-15 01:52:14 +01:00
2012-02-16 01:34:37 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 14:56:18 +00:00
2012-01-28 14:56:18 +00:00
2012-01-29 00:34:59 +01:00
2012-01-19 23:31:22 +01:00
2012-02-17 00:35:06 +01:00
2012-02-01 04:43:06 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 06:25:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-17 14:28:56 -05:00
2012-02-17 14:28:56 -05:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 01:36:42 +01:00
2012-01-22 04:49:46 +01:00
2012-01-11 11:15:05 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 14:31:17 +01:00
2012-02-02 14:31:17 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-06 08:00:31 +01:00
2012-02-18 02:20:19 +01:00
2012-01-28 22:08:21 +01:00
2012-02-06 00:29:32 +01:00
2012-02-06 00:29:32 +01:00
2012-01-12 18:18:23 +01:00
2012-01-12 18:18:23 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-07 01:40:29 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-12 01:06:13 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 04:01:24 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-02-17 20:46:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-17 22:39:23 +01:00
2012-02-04 01:12:04 +01:00
2012-02-02 02:24:09 +01:00
4a519b6e03