Michael Niedermayer
91eb1b1525
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (22 commits)
prores: add FATE tests
id3v2: reduce the scope of some non-globally-used symbols/structures
id3v2: cosmetics: move some declarations before the places they are used
shorten: remove the flush function.
shn: do not allow seeking in the raw shn demuxer.
avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
avformat: update AVInputFormat allowed flags
avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
truespeech: use sizeof() instead of hardcoded sizes
truespeech: remove unneeded variable, 'consumed'
truespeech: simplify truespeech_read_frame() by using get_bits()
truespeech: decode directly to output buffer instead of a temp buffer
truespeech: check to make sure channels == 1
truespeech: check for large enough output buffer rather than truncating output
truespeech: remove unneeded zero-size packet check.
mlpdec: return meaningful error codes instead of -1
mlpdec: remove unnecessary wrapper function
mlpdec: only calculate output size once
mlpdec: validate that the reported channel count matches the actual output channel count
pcm: reduce pointer type casting
...
Conflicts:
libavformat/avformat.h
libavformat/id3v2.c
libavformat/id3v2.h
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-14 03:48:22 +02:00
2011-10-11 03:42:43 +02:00
2011-07-17 20:12:02 +02:00
2011-07-31 19:40:08 +02:00
2011-07-17 20:12:02 +02:00
2011-09-26 00:24:01 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-10-10 02:58:18 +02:00
2011-07-17 20:12:02 +02:00
2011-10-01 02:41:39 +02:00
2011-07-17 20:12:02 +02:00
2011-09-12 21:12:31 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:43:54 +02:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-09-12 22:12:14 +02:00
2011-10-05 23:44:14 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-08-14 00:05:36 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-10-14 03:48:22 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-11 03:42:43 +02:00
2011-10-01 03:48:33 +02:00
2011-05-22 04:53:19 +02:00
2011-06-01 20:29:27 +02:00
2011-07-03 03:14:10 +02:00
2011-09-28 18:13:52 +02:00
2011-09-10 05:24:39 +02:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2011-10-10 21:36:12 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-14 19:51:07 +02:00
2011-09-28 16:11:01 +02:00
2011-09-25 12:29:20 +02:00
2011-07-17 20:12:02 +02:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2011-09-14 19:51:07 +02:00
2011-08-22 09:35:58 +02:00
2011-05-27 23:48:22 +02:00
2011-10-12 04:15:40 +02:00
2011-04-09 03:17:07 +02:00
2011-07-17 20:12:02 +02:00
2011-10-12 16:51:16 +02:00
2011-05-01 00:26:05 +02:00
2011-09-24 22:39:52 +02:00
2011-07-17 20:12:02 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-14 19:51:07 +02:00
2011-05-02 18:38:01 +02:00
2011-08-26 20:53:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-09 19:56:25 +02:00
2011-09-14 19:51:07 +02:00
2011-09-07 07:27:55 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-06-09 04:47:19 +02:00
2011-10-07 22:28:07 +02:00
2011-09-14 19:51:07 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-09-07 02:36:42 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-07-17 20:12:02 +02:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-04-21 03:37:05 +02:00
2011-08-03 20:06:38 +02:00
2011-03-19 13:33:20 +00:00
2011-09-28 18:13:52 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-10-13 06:00:03 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-10-14 03:48:22 +02:00
2011-10-14 03:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-24 22:39:52 +02:00
2011-09-23 00:35:31 +02:00
2011-10-13 06:00:03 +02:00
2011-09-17 22:36:43 +02:00
2011-07-14 02:24:10 +02:00
2011-07-17 20:12:02 +02:00
2011-10-09 22:58:31 +02:00
2011-08-26 01:29:40 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-09-14 19:53:39 +02:00
2011-10-13 06:00:03 +02:00
2011-01-30 03:40:58 +01:00
2011-10-13 18:08:51 +02:00
2011-07-17 20:12:02 +02:00
2011-07-06 01:34:08 +02:00
2011-07-17 20:12:02 +02:00
2011-08-20 00:27:38 +02:00
2011-04-07 03:32:26 +02:00
2011-05-27 23:48:22 +02:00
2011-10-13 16:50:20 +02:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2011-09-29 01:11:01 +02:00
2011-09-28 02:07:44 +02:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-05-17 03:05:36 +02:00
2011-10-12 05:40:57 +02:00
2011-10-13 06:00:03 +02:00
2011-06-11 03:51:36 +02:00
2011-07-11 04:23:25 +02:00
2011-09-21 00:51:53 +02:00
2011-10-13 06:00:03 +02:00
2011-10-07 16:25:30 +02:00
2011-07-17 20:12:02 +02:00
2011-10-08 03:39:01 +02:00
2011-03-19 13:33:20 +00:00
2011-09-01 01:31:03 +02:00
2011-10-13 06:00:03 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-05-27 23:48:22 +02:00
2011-08-09 19:56:25 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-27 22:27:52 +02:00
2011-03-19 13:33:20 +00:00
2011-10-11 03:42:43 +02:00
2011-10-13 06:00:03 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-06-05 03:00:31 +02:00
2011-09-14 19:53:45 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-09-05 03:10:45 +02:00
2011-09-18 18:25:44 +02:00
2011-09-26 13:51:29 +02:00
2011-09-26 13:51:29 +02:00
2011-10-01 01:26:55 +02:00
2011-10-05 04:07:59 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-02 20:06:00 +01:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:59:00 +02:00
2011-02-06 16:08:59 -05:00
2011-06-08 07:43:45 +02:00
2011-09-21 21:25:43 +02:00
2011-10-13 06:00:03 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-04-06 19:30:42 +02:00
2011-09-23 19:10:55 +02:00
2011-10-13 20:10:25 +02:00
2011-07-15 17:51:09 +02:00
2011-03-19 13:33:20 +00:00
2011-09-14 19:53:45 +02:00
2011-10-14 03:48:22 +02:00
2011-09-17 22:36:43 +02:00
2011-10-13 16:50:20 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-06-18 05:10:38 +02:00
2011-07-14 20:44:58 +02:00
2011-10-05 04:07:59 +02:00
2011-04-15 04:50:06 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-09-19 22:45:34 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-09-23 00:35:31 +02:00
2011-10-13 06:00:03 +02:00
2011-09-27 02:14:37 +02:00
2011-04-24 03:41:22 +02:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-06-03 05:19:30 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-04-24 03:41:22 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-09-27 02:14:37 +02:00
2011-08-26 23:18:54 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-06 23:19:45 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-10-12 05:40:57 +02:00
2011-09-27 02:14:37 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-07-17 20:12:02 +02:00
2011-10-13 06:00:03 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-09-27 14:52:46 +02:00
2011-07-17 20:12:02 +02:00
2011-05-30 02:39:26 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-12 03:48:21 +02:00
2011-03-19 13:33:20 +00:00
2011-09-14 19:53:45 +02:00
2011-09-14 19:53:45 +02:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-08-25 21:43:30 +02:00
2011-07-14 20:44:58 +02:00
2011-10-14 03:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-10-14 03:48:22 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-08-27 22:12:51 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-07-17 20:12:02 +02:00
2011-10-13 06:00:03 +02:00
2011-07-17 20:12:02 +02:00
2011-10-09 03:08:03 +02:00
2011-09-08 01:55:07 +02:00
2011-09-08 01:55:07 +02:00
2011-09-14 19:53:45 +02:00
2011-09-26 00:22:41 +02:00
2011-08-21 15:27:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-26 16:26:57 +02:00
2011-07-17 20:12:02 +02:00
2011-09-14 19:53:45 +02:00
2011-07-17 20:12:02 +02:00
91eb1b1525