Michael Niedermayer
6bfb3042b3
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
avconv: use default alignment for audio buffer
avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()
avutil: use align == 0 for default alignment in audio sample buffer functions
avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc()
avconv: remove OutputStream.picref.
avconv: only set SAR once on the decoded frame.
avcodec: validate the channel layout vs. channel count for decoders
audioconvert: make av_get_channel_layout accept composite names.
avutil: add av_get_packed_sample_fmt() and av_get_planar_sample_fmt()
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/utils.c
libavcodec/version.h
libavutil/audioconvert.c
libavutil/audioconvert.h
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-09 23:02:33 +02:00
2012-03-13 01:56:33 +01: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-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-03-16 01:36:49 +01:00
2012-02-04 20:27:02 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 01:51:53 +01:00
2011-11-23 04:02:17 +01:00
2011-11-11 04:24:00 +01:00
2012-04-09 23:02:33 +02:00
2012-04-09 23:02:33 +02:00
2011-05-22 04:53:19 +02:00
2011-11-07 03:01:43 +01:00
2011-12-13 00:39:48 +01:00
2012-04-09 23:02:33 +02:00
2012-01-22 23:06:04 +01:00
2011-11-23 04:02:17 +01:00
2012-03-21 13:39:28 +01:00
2012-03-21 13:39:28 +01:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2012-02-22 15:35:44 +01:00
2012-03-13 01:56:33 +01:00
2012-03-13 01:56:33 +01:00
2011-03-19 13:33:20 +00:00
2011-12-05 00:11:57 +01:00
2012-01-29 00:34:59 +01:00
2012-04-02 21:23:56 +02:00
2011-09-21 21:25:43 +02:00
2011-11-07 03:01:43 +01:00
2012-03-20 00:03:19 +01:00
2012-02-26 05:11:21 +01:00
2012-02-26 05:11:21 +01:00
2012-04-01 11:01:08 +02:00
2011-12-12 01:25:37 +01:00
2011-12-23 00:18:36 +01:00
2011-08-30 10:03:13 +02:00
2012-01-28 07:53:34 +01:00
2011-10-16 21:51:28 +02:00
2012-03-29 04:11:10 +02:00
2011-11-23 04:02:17 +01:00
2011-06-28 13:14:46 +02:00
2011-06-28 13:14:46 +02:00
2011-12-13 00:39:48 +01:00
2012-01-29 00:34:59 +01:00
2011-12-12 01:25:37 +01:00
2011-12-11 18:47:19 +00:00
2011-11-23 04:02:17 +01:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2012-04-04 21:17:52 +02:00
2011-07-04 00:45:21 +02:00
2010-01-16 04:49:02 +00:00
2011-10-22 19:49:27 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2012-01-09 22:35:45 +01:00
2012-02-06 11:30:54 +01:00
2012-03-26 13:00:09 +02:00
2011-12-31 16:31:15 +01:00
2012-03-26 20:52:52 +02:00
2012-02-21 05:10:12 +01:00
2012-02-21 05:10:12 +01:00
2011-07-04 00:45:21 +02:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2011-12-25 18:55:43 +01:00
2012-01-20 20:34:48 +01:00
2011-12-05 21:13:45 +01:00
2012-03-29 04:11:10 +02:00
2012-02-06 11:30:54 +01:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2012-04-09 17:21:35 +02:00
2012-03-21 19:01:39 +01:00
2012-01-28 01:30:41 +01:00
2012-02-23 23:44:38 +01:00
2011-11-23 04:02:17 +01:00
2012-03-26 13:00:09 +02:00
2011-11-23 04:02:17 +01:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2012-04-09 23:02:33 +02:00
2012-04-09 23:02:33 +02:00
2012-02-14 01:53:31 +01:00
2011-11-23 04:02:17 +01:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2012-02-03 00:56:27 +01:00
2012-02-02 14:30:28 +01:00
2012-01-06 02:45:12 +01:00
2012-02-09 18:37:58 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 03:01:17 +01:00
2011-03-19 13:33:20 +00:00
6bfb3042b3