Michael Niedermayer
f095391a14
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (31 commits)
cdxl demux: do not create packets with uninitialized data at EOF.
Replace computations of remaining bits with calls to get_bits_left().
amrnb/amrwb: Remove get_bits usage.
cosmetics: reindent
avformat: do not require a pixel/sample format if there is no decoder
avformat: do not fill-in audio packet duration in compute_pkt_fields()
lavf: Use av_get_audio_frame_duration() in get_audio_frame_size()
dca_parser: parse the sample rate and frame durations
libspeexdec: do not set AVCodecContext.frame_size
libopencore-amr: do not set AVCodecContext.frame_size
alsdec: do not set AVCodecContext.frame_size
siff: do not set AVCodecContext.frame_size
amr demuxer: do not set AVCodecContext.frame_size.
aiffdec: do not set AVCodecContext.frame_size
mov: do not set AVCodecContext.frame_size
ape: do not set AVCodecContext.frame_size.
rdt: remove workaround for infinite loop with aac
avformat: do not require frame_size in avformat_find_stream_info() for CELT
avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3
avformat: do not require frame_size in avformat_find_stream_info() for AAC
...
Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/dsputil_mmx.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-06 06:03:32 +01:00
2012-02-06 20:33:06 +01:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 07:50:31 +01:00
2012-02-16 01:34:37 +01:00
2012-03-06 06:03:32 +01:00
2011-12-12 01:25:37 +01:00
2012-03-03 04:30:49 +01:00
2012-03-06 06:03:32 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-06 06:03:32 +01:00
2012-02-25 04:00:43 +01:00
2012-02-10 01:20:07 +01:00
2011-12-31 22:33:58 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-02-16 01:34:37 +01:00
2012-03-06 06:03:32 +01:00
2012-02-21 23:55:47 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2012-02-06 02:04:08 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-03 00:23:10 +01:00
2012-02-17 00:35:06 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-01-29 18:11:39 +01:00
2012-01-28 07:53:34 +01:00
2012-03-03 04:30:49 +01:00
2012-01-27 10:51:57 +01:00
2012-02-16 01:34:37 +01:00
2012-02-06 02:04:09 +01:00
2012-02-11 01:22:22 +01:00
2012-01-23 17:18:13 +01:00
2012-01-28 07:53:34 +01:00
2012-03-05 16:27:31 -05:00
2011-12-30 20:00:53 +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-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-03-06 06:03:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-03-04 04:26:04 +01:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-02-01 02:36:09 +01:00
2011-12-11 01:05:33 +01:00
2012-01-28 07:53:34 +01:00
2011-12-22 01:51:53 +01:00
2012-02-28 03:38:58 +01:00
2012-02-05 17:42:26 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-22 02:24:18 +01:00
2012-01-06 02:45:12 +01:00
2012-01-31 07:50:31 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 14:31:17 +01:00
2012-02-21 05:10:12 +01:00
2012-02-15 01:52:14 +01:00
2012-01-06 02:45:12 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-23 04:31:55 +01:00
2012-02-23 04:31:55 +01:00
2012-02-23 04:31:55 +01:00
2012-02-01 02:36:09 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-02-23 04:31:55 +01:00
2012-02-23 04:31:55 +01:00
2012-01-29 00:34:59 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-02-11 01:40:52 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-15 01:52:14 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-01-29 00:34:59 +01:00
2012-03-03 04:30:49 +01:00
2012-03-01 03:17:11 +01:00
2012-03-05 19:02:48 +01:00
2012-03-05 19:02:48 +01:00
2012-02-04 02:34:14 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-16 01:34:37 +01:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-01-05 10:34:06 -08:00
2012-02-28 20:48:43 +01:00
2012-03-06 06:03:32 +01:00
2012-02-28 03:38:58 +01:00
2012-02-23 04:31:55 +01:00
2012-02-17 00:35:06 +01:00
2012-03-01 15:32:28 -08:00
2012-03-01 03:17:11 +01:00
2012-02-10 15:27:49 -05:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-04 04:26:04 +01:00
2012-02-29 00:30:35 +01:00
2012-02-14 01:53:31 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-28 20:24:01 +01:00
2012-02-28 20:24:01 +01:00
2012-02-28 20:24:01 +01:00
2012-02-02 14:31:17 +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-03 19:51:13 +01:00
2012-02-14 01:53:31 +01:00
2012-02-09 23:25:46 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-18 21:35:49 +01:00
2012-02-25 04:00:43 +01:00
2012-03-03 00:23:10 +01:00
2012-02-04 20:18:31 +01:00
2012-03-02 11:11:38 +01:00
2012-03-03 16:43:11 -05:00
2011-12-19 02:34:18 +01:00
2011-12-20 22:38:53 +01:00
2012-03-01 03:17:11 +01:00
2012-02-29 14:26:14 +01:00
2012-01-28 07:53:34 +01:00
2012-02-18 12:26:35 +01:00
2012-02-03 19:51:13 +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-28 07:20:36 +01:00
2012-03-04 04:26:04 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-03 00:23:10 +01:00
2012-02-26 07:30:21 +01:00
2012-02-01 02:36:09 +01:00
2012-01-05 02:03:12 +01:00
2012-02-01 02:36:09 +01:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-02-29 00:30:35 +01:00
2012-03-03 00:23:10 +01:00
2012-01-03 03:06:45 +01:00
2012-01-28 07:53:34 +01:00
2012-02-16 01:34:37 +01:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2012-02-24 02:57:18 +01:00
2012-02-17 00:35:06 +01:00
2012-01-29 00:34:59 +01:00
2011-12-13 00:39:48 +01:00
2012-02-19 01:47:10 +01:00
2012-02-18 17:31:55 +02:00
2012-02-19 01:47:10 +01:00
2012-02-14 01:53:31 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2011-12-13 00:39:48 +01:00
2012-03-04 04:26:04 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-03-01 16:08:32 +02:00
2012-02-24 02:57:18 +01:00
2011-12-12 01:25:37 +01:00
2012-01-29 00:34:59 +01:00
2012-03-06 06:03:32 +01:00
2012-03-01 23:11:31 +01:00
2012-02-17 00:35:06 +01:00
2012-02-28 03:38:58 +01:00
2012-01-23 01:05:20 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-23 16:00:22 +01:00
2012-02-24 02:57:18 +01:00
2011-12-13 00:39:48 +01:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-03-04 04:26:04 +01:00
2012-02-28 15:01:20 +01:00
2012-01-28 07:53:34 +01:00
2012-03-06 06:03:32 +01:00
2012-01-28 07:53:34 +01:00
2012-01-17 02:37:30 +01:00
2012-01-16 11:29:55 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-12-12 01:25:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-05 16:27:07 -08:00
2012-01-28 07:53:34 +01:00
2012-03-01 03:17:11 +01:00
2012-03-06 06:03:32 +01:00
2012-01-06 02:45:12 +01:00
2012-03-04 04:26:04 +01:00
2012-03-04 04:26:04 +01:00
2012-01-05 23:56:52 +02:00
2012-02-10 15:27:49 -05:00
2012-03-04 04:26:04 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-23 23:24:14 +01:00
2012-01-28 07:53:34 +01:00
2012-03-06 06:03:32 +01:00
2012-01-28 07:53:34 +01:00
2011-12-30 20:00:53 +01:00
2012-03-01 03:17:11 +01:00
2012-02-16 01:34:37 +01:00
2012-03-04 04:26:04 +01:00
2011-12-13 00:39:48 +01:00
2012-03-04 04:26:04 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 04:43:06 +01:00
2012-01-28 07:53:34 +01:00
2012-01-27 10:51:57 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 01:20:07 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:50 -05:00
2012-01-31 02:46:26 +01:00
f095391a14