Michael Niedermayer
aedc908601
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (35 commits)
flvdec: Do not call parse_keyframes_index with a NULL stream
libspeexdec: include system headers before local headers
libspeexdec: return meaningful error codes
libspeexdec: cosmetics: reindent
libspeexdec: decode one frame at a time.
swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables()
Move timefilter code from lavf to lavd.
mov: add support for hdvd and pgapmetadata atoms
mov: rename function _stik, some indentation cosmetics
mov: rename function _int8 to remove ambiguity, some indentation cosmetics
mov: parse the gnre atom
mp3on4: check for allocation failures in decode_init_mp3on4()
mp3on4: create a separate flush function for MP3onMP4.
mp3on4: ensure that the frame channel count does not exceed the codec channel count.
mp3on4: set channel layout
mp3on4: fix the output channel order
mp3on4: allocate temp buffer with av_malloc() instead of on the stack.
mp3on4: copy MPADSPContext from first context to all contexts.
fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm
fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm
...
Conflicts:
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_ps.c
libavcodec/h264dsp_template.c
libavcodec/h264idct_template.c
libavcodec/h264pred.c
libavcodec/h264pred_template.c
libavcodec/x86/h264dsp_mmx.c
libavdevice/Makefile
libavdevice/jack_audio.c
libavformat/Makefile
libavformat/flvdec.c
libavformat/flvenc.c
libavutil/pixfmt.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-22 01:16:41 +02:00
2011-10-22 01:16:41 +02:00
2011-09-25 12:29:20 +02:00
2011-10-22 01:16:41 +02:00
2011-10-22 01:16:41 +02:00
2011-10-10 21:37:36 +02:00
2011-09-23 00:35:31 +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-21 02:01:26 +02:00
2011-09-23 22:31:57 +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-12 16:51:16 +02:00
2011-10-11 14:57:58 -04:00
2011-09-24 19:39:18 +02:00
2011-09-24 19:39:18 +02:00
2011-09-24 19:39:18 +02:00
2011-10-01 02:54:46 +02:00
2011-10-16 04:02:09 +02:00
2011-10-01 02:54:46 +02:00
2011-10-20 13:06:15 -04:00
2011-10-21 02:01:26 +02:00
2011-09-24 19:39:18 +02:00
2011-10-10 21:36:12 +02:00
2011-10-04 07:48:56 +02:00
2011-10-21 02:01:26 +02:00
2011-10-09 03:08:02 +02:00
2011-10-21 02:01:26 +02:00
2011-10-10 21:36:12 +02:00
2011-10-09 04:02:03 +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-09-29 21:43:52 +02:00
2011-09-29 21:43:52 +02:00
2011-10-01 23:16:25 +02:00
2011-10-01 23:16:25 +02:00
2011-10-06 23:35:29 +02:00
2011-10-21 02:01:26 +02:00
2011-10-06 23:31:06 +02:00
2011-10-17 07:33:10 +02:00
2011-10-09 04:02:03 +02:00
2011-10-01 02:54:46 +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-10 09:40:26 -07:00
2011-10-16 04:02:09 +02:00
2011-10-01 02:54:46 +02:00
2011-09-21 13:51:53 +02:00
2011-10-07 16:25:31 +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-01 02:54:46 +02:00
2011-09-30 11:17:53 +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-10 21:37:36 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-13 06:00:03 +02:00
2011-10-04 08:04:17 +02:00
2011-10-12 05:40:57 +02:00
2011-09-21 09:57:32 +02:00
2011-09-28 02:59:28 +02:00
2011-10-21 02:01:26 +02:00
2011-10-22 01:16:41 +02:00
2011-10-10 02:58:18 +02:00
2011-10-11 13:55:09 +02:00
2011-09-24 21:11:01 +02:00
2011-09-24 21:11:01 +02:00
2011-10-01 18:18:06 +02:00
2011-10-01 06:07:05 +02:00
2011-09-25 21:16:55 +02:00
2011-10-12 05:40:57 +02:00
2011-09-21 21:25:43 +02:00
2011-10-21 02:01:26 +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-21 02:01:26 +02:00
2011-10-22 01:16:41 +02:00
2011-10-05 03:21:47 +02:00
2011-10-22 01:16:41 +02:00
2011-10-21 01:00:41 -07: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-09-29 06:11:18 +02:00
2011-09-29 06:11:18 +02:00
2011-09-28 18:43:49 +02:00
2011-10-21 02:01:26 +02:00
2011-09-26 02:28:21 +02:00
2011-10-21 02:27:33 +02:00
2011-09-27 02:14:37 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +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-09-24 22:39:52 +02:00
2011-09-24 19:39:18 +02:00
2011-10-21 02:01:26 +02:00
2011-10-14 03:48:22 +02:00
2011-10-13 06:00:03 +02:00
2011-09-26 00:24:38 +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-03 01:02:45 +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-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: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-22 01:16:41 +02:00
2011-10-22 01:16:41 +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-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-04 08:04:17 +02:00
2011-10-03 01:02:45 +02:00
2011-10-20 02:34:51 +02:00
2011-10-14 03:48:22 +02:00
2011-10-04 06:39:29 +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-17 02:29:40 +02:00
2011-10-11 03:42:43 +02:00
2011-10-21 02:01:26 +02:00
2011-10-05 04:07:59 +02:00
2011-10-13 06:00:03 +02:00
2011-10-05 04:07:59 +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-09-24 22:39:52 +02:00
2011-10-11 03:42:43 +02:00
2011-09-24 01:03:07 +02:00
2011-10-04 11:58:53 +02:00
2011-10-17 07:33:10 +02:00
2011-09-24 22:39:52 +02:00
2011-09-19 22:45:34 +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-13 06:00:03 +02:00
2011-10-18 22:49:43 +02:00
2011-10-21 02:01:26 +02:00
2011-10-02 21:20:57 +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-09-24 22:39:52 +02:00
2011-10-09 03:22:49 +02:00
2011-10-22 01:16:41 +02:00
2011-10-19 08:24:19 +02: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-20 02:34:51 +02:00
2011-10-11 03:42:43 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-06 23:33:09 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-07 00:27:03 +02:00
2011-10-07 00:37:32 +02:00
2011-10-22 01:16:41 +02:00
2011-10-22 01:16:41 +02:00
2011-10-07 00:27:24 +02:00
2011-10-07 00:27:03 +02:00
2011-10-09 03:08:03 +02:00
2011-10-16 21:45:16 +02:00
2011-10-07 16:25:31 +02:00
2011-09-24 22:39:52 +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-09-27 02:14:37 +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
aedc908601