1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
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-20 18:46:56 -04:00
2012-03-27 11:58:15 -04:00
2012-02-20 15:08:41 -05:00
2012-04-06 08:32:09 +02:00
2012-01-14 04:47:27 +01:00
2012-03-21 03:03:33 +01:00
2012-04-01 16:11:29 +02:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-03-13 01:14:04 +01:00
2012-04-06 22:37:38 +03:00
2012-04-09 20:55:09 +02:00
2012-03-02 18:58:19 +02:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2012-03-26 22:22:51 +02:00
2012-03-31 23:31:56 +02:00
2012-03-30 20:10:39 +02:00
2012-02-14 01:22:38 +01:00
2012-03-22 13:23:08 +01:00
2012-03-24 23:35:09 +01:00
2012-04-06 08:32:09 +02:00
2012-01-07 00:11:43 +01:00
2012-03-24 14:54:12 +01:00
2012-04-06 22:37:38 +03:00
2012-03-19 18:46:34 +01:00
2012-04-06 00:53:09 +02:00
2012-03-06 10:47:42 -08:00
2012-03-07 10:29:52 -08:00
2012-02-16 06:25:32 +01:00
2012-03-19 22:37:06 +01:00
2012-03-24 17:48:03 +01:00
2012-04-07 19:59:00 +02:00
2012-03-25 12:24:15 +02:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-03-13 01:14:04 +01:00
2012-03-02 08:26:36 +01:00
2012-03-27 20:08:41 +02:00
2012-01-23 19:04:35 +01:00
2012-03-18 07:45:41 -07:00