Michael Niedermayer d17e7070a0
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (51 commits)
cin audio: use sign_extend() instead of casting to int16_t
cin audio: restructure decoding loop to avoid a separate counter variable
cin audio: use local variable for delta value
cin audio: remove unneeded cast from void*
cin audio: validate the channel count
cin audio: remove unneeded AVCodecContext pointer from CinAudioContext
dsicin: fix several audio-related fields in the CIN demuxer
flacdec: use av_get_bytes_per_sample() to get sample size
dca: handle errors from dca_decode_block()
dca: return error if the frame header is invalid
dca: return proper error codes instead of -1
utvideo: handle empty Huffman trees
binkaudio: change short to int16_t
binkaudio: only decode one block at a time.
binkaudio: store interleaved overlap samples in BinkAudioContext.
binkaudio: pre-calculate quantization factors
binkaudio: add some buffer overread checks.
atrac3: support float or int16 output using request_sample_fmt
atrac3: add CODEC_CAP_SUBFRAMES capability
atrac3: return appropriate error codes instead of -1
...
Conflicts:
libavcodec/atrac1.c
libavcodec/dca.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-10-30 01:33:41 +02:00
2011-10-24 01:01:21 +02:00
2011-10-22 01:16:41 +02:00
2011-10-27 01:39:04 +02:00
2011-10-10 21:37:36 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-28 22:44:59 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-23 05:13:56 +02:00
2011-10-22 11:11:08 +02:00
2011-10-22 11:11:08 +02:00
2011-10-22 11:11:08 +02:00
2011-10-22 11:11:08 +02:00
2011-10-23 11:30:54 -04:00
2011-10-22 11:11:08 +02:00
2011-10-22 11:11:08 +02:00
2011-10-11 14:57:58 -04:00
2011-10-24 23:45:44 +02:00
2011-10-27 01:39:04 +02:00
2011-10-29 12:46:05 +02:00
2011-10-23 05:13:56 +02:00
2011-10-10 21:36:12 +02:00
2011-10-29 02:08:54 +02:00
2011-10-21 02:01:26 +02:00
2011-10-30 01:33:41 +02:00
2011-10-30 01:33:41 +02:00
2011-10-29 02:08:54 +02:00
2011-10-10 21:36:12 +02:00
2011-10-09 04:02:03 +02:00
2011-10-30 01:33:41 +02:00
2011-10-07 22:28:07 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-06 23:35:29 +02:00
2011-10-21 02:01:26 +02:00
2011-10-22 16:49:49 +02:00
2011-10-30 01:33:41 +02:00
2011-10-17 07:33:10 +02:00
2011-10-28 15:26:31 +02:00
2011-10-30 01:33:41 +02:00
2011-10-12 22:08:15 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-22 22:18:12 +02:00
2011-10-22 22:18:12 +02:00
2011-10-22 22:18:12 +02:00
2011-10-22 22:18:12 +02:00
2011-10-30 01:33:41 +02:00
2011-10-12 05:40:57 +02:00
2011-10-21 01:00:41 -07:00
2011-10-21 02:01:26 +02:00
2011-10-15 20:30:54 +02:00
2011-10-16 02:06:31 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-10 21:36:13 +02:00
2011-10-09 03:08:03 +02:00
2011-10-09 03:08:02 +02:00
2011-10-22 19:45:22 +02:00
2011-10-21 02:01:26 +02:00
2011-10-30 01:33:41 +02:00
2011-10-13 06:00:03 +02:00
2011-10-12 05:40:57 +02:00
2011-10-21 02:01:26 +02:00
2011-10-22 01:16:41 +02:00
2011-10-24 01:01:21 +02:00
2011-10-23 11:42:34 -04:00
2011-10-25 11:30:50 -04:00
2011-10-23 11:42:34 -04:00
2011-10-10 02:58:18 +02:00
2011-10-11 13:55:09 +02:00
2011-10-12 05:40:57 +02:00
2011-10-23 05:13:56 +02:00
2011-10-21 02:01:26 +02:00
2011-10-24 01:01:21 +02:00
2011-10-23 05:13:56 +02:00
2011-10-22 01:16:41 +02:00
2011-10-21 01:00:41 -07:00
2011-10-17 02:29:40 +02:00
2011-10-21 01:00:41 -07:00
2011-10-21 01:00:41 -07:00
2011-10-27 17:53:29 +02:00
2011-10-23 14:27:39 +02:00
2011-10-26 14:32:01 +02:00
2011-10-30 01:33:41 +02:00
2011-10-27 17:53:29 +02:00
2011-10-21 01:00:41 -07:00
2011-10-22 01:16:41 +02:00
2011-10-22 01:16:41 +02:00
2011-10-22 01:16:41 +02:00
2011-10-22 01:16:41 +02:00
2011-10-22 01:16:41 +02:00
2011-10-22 01:16:41 +02:00
2011-10-21 01:00:41 -07:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-10 03:50:58 +02:00
2011-10-21 02:01:26 +02:00
2011-10-27 20:43:27 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:27:33 +02:00
2011-10-25 15:04:51 +02:00
2011-10-13 06:00:03 +02:00
2011-10-27 01:39:04 +02:00
2011-10-21 01:07:22 -07:00
2011-10-22 01:16:41 +02:00
2011-10-21 02:01:26 +02:00
2011-10-13 18:04:02 +02:00
2011-10-17 23:44:12 +02:00
2011-10-21 02:01:26 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-17 07:33:10 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-16 21:51:28 +02:00
2011-10-16 21:51:28 +02:00
2011-10-29 12:46:05 +02:00
2011-10-14 03:48:22 +02:00
2011-10-30 00:29:17 +02:00
2011-10-23 05:13:56 +02:00
2011-10-23 05:13:56 +02:00
2011-10-14 03:48:22 +02:00
2011-10-14 03:48:22 +02:00
2011-10-12 05:40:57 +02:00
2011-10-12 05:40:57 +02:00
2011-10-07 16:25:32 +02:00
2011-10-21 02:01:26 +02:00
2011-10-07 17:15:45 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-17 13:01:23 +02:00
2011-10-10 03:50:58 +02:00
2011-10-24 01:01:21 +02:00
2011-10-27 23:06:26 +02:00
2011-10-24 01:48:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:27:33 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-29 02:08:54 +02:00
2011-10-29 02:08:54 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-24 01:04:14 +02:00
2011-10-24 01:48:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-23 05:13:56 +02:00
2011-10-29 02:08:54 +02:00
2011-10-29 02:08:54 +02:00
2011-10-23 05:13:56 +02:00
2011-10-24 18:41:03 +02:00
2011-10-27 01:39:04 +02:00
2011-10-14 21:45:14 +02:00
2011-10-16 04:02:09 +02:00
2011-10-12 19:55:25 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-29 16:53:37 +02:00
2011-10-27 01:39:04 +02:00
2011-10-11 03:42:43 +02:00
2011-10-21 02:01:26 +02:00
2011-10-13 06:00:03 +02:00
2011-10-07 16:25:31 +02:00
2011-10-09 03:22:57 +02:00
2011-10-11 03:42:43 +02:00
2011-10-11 03:42:43 +02:00
2011-10-11 03:42:43 +02:00
2011-10-22 19:45:31 +02:00
2011-10-17 07:33:10 +02:00
2011-10-27 14:34:45 +02:00
2011-10-27 15:27:32 +02:00
2011-10-21 02:01:26 +02:00
2011-10-13 06:00:03 +02:00
2011-10-21 01:00:41 -07:00
2011-10-12 15:52:22 +02:00
2011-10-12 15:52:22 +02:00
2011-10-13 06:00:03 +02:00
2011-10-21 02:01:26 +02:00
2011-10-14 21:34:20 +02:00
2011-10-14 22:24:00 +02:00
2011-10-12 05:40:57 +02:00
2011-10-12 05:40:57 +02:00
2011-10-12 05:40:57 +02:00
2011-10-29 02:08:54 +02:00
2011-10-18 22:49:43 +02:00
2011-10-21 02:01:26 +02:00
2011-10-07 16:25:31 +02:00
2011-10-10 21:36:13 +02:00
2011-10-17 07:33:10 +02:00
2011-10-17 07:33:10 +02:00
2011-10-14 03:48:22 +02:00
2011-10-26 02:36:07 +02:00
2011-10-23 05:13:56 +02:00
2011-10-09 03:22:49 +02:00
2011-10-28 01:37:50 +02:00
2011-10-29 12:54:08 -07:00
2011-10-20 00:35:45 +02:00
2011-10-19 20:26:55 +02:00
2011-10-10 14:11:02 +02:00
2011-10-14 03:48:22 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-11 03:42:43 +02:00
2011-10-23 05:13:56 +02:00
2011-10-11 03:42:43 +02:00
2011-10-21 02:01:26 +02:00
2011-10-24 23:45:44 +02:00
2011-10-24 23:45:44 +02:00
2011-10-29 13:17:08 +02:00
2011-10-06 23:33:09 +02:00
2011-10-22 20:46:56 +02:00
2011-10-24 01:01:21 +02:00
2011-10-30 01:33:41 +02:00
2011-10-07 00:27:03 +02:00
2011-10-07 00:37:32 +02:00
2011-10-30 01:33:41 +02:00
2011-10-22 01:16:41 +02:00
2011-10-07 00:27:24 +02:00
2011-10-26 23:56:34 +02:00
2011-10-09 03:08:03 +02:00
2011-10-16 21:45:16 +02:00
2011-10-24 01:01:21 +02:00
2011-10-29 02:08:54 +02:00
2011-10-21 02:01:26 +02:00
2011-10-24 15:55:57 +02:00
2011-10-29 02:08:54 +02:00
2011-10-29 02:08:54 +02:00
2011-10-08 03:39:01 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-09 03:22:57 +02:00
2011-10-10 03:50:58 +02:00
d17e7070a0