Michael Niedermayer
305e4b35ea
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (34 commits)
mlp_parser: fix the channel mask value used for the top surround channel
vorbisenc: check all allocations for failure
roqaudioenc: return AVERROR codes instead of -1
roqaudioenc: set correct bit rate
roqaudioenc: use AVCodecContext.frame_size correctly.
roqaudioenc: remove unneeded sample_fmt check
ra144enc: use int16_t* for input samples rather than void*
ra144enc: set AVCodecContext.coded_frame
ra144enc: remove unneeded sample_fmt check
nellymoserenc: set AVCodecContext.coded_frame
nellymoserenc: improve error checking in encode_init()
nellymoserenc: return AVERROR codes instead of -1
libvorbis: improve error checking in oggvorbis_encode_init()
mpegaudioenc: return AVERROR codes instead of -1
libfaac: improve error checking and handling in Faac_encode_init()
avutil: add AVERROR_UNKNOWN
check for coded_frame allocation failure in several audio encoders
audio encoders: do not set coded_frame->key_frame.
g722enc: check for trellis data allocation error
libspeexenc: export encoder delay through AVCodecContext.delay
...
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/fraps.c
libavcodec/kgv1dec.c
libavcodec/libfaac.c
libavcodec/libgsm.c
libavcodec/libvorbis.c
libavcodec/mlp_parser.c
libavcodec/roqaudioenc.c
libavcodec/vorbisenc.c
libavutil/avutil.h
libavutil/error.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-26 05:11:21 +01:00
..
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2011-12-14 20:09:46 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-17 00:35:06 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-25 00:18:24 -05:00
2012-02-25 00:18:24 -05:00
2012-02-25 00:18:24 -05:00
2012-02-25 00:18:24 -05:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-08 21:51:24 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-01-19 00:45:06 +01:00
2011-12-30 21:14:07 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-22 23:09:47 +01:00
2012-02-08 21:51:24 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2011-10-18 10:45:22 +03:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-01-07 11:04:46 -08:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-07 20:11:11 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2011-11-04 19:40:32 +01:00
2011-11-04 19:40:32 +01:00
2011-11-04 19:40:32 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-07 20:06:57 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-24 00:36:51 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-13 22:29:22 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2011-12-15 13:31:40 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-25 01:06:19 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-01-08 17:26:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-22 19:31:06 +01:00
2012-02-03 09:29:02 +01:00
2012-01-08 18:33:59 -08:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00