• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6bfb3042
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6bfb3042
ffmpeg.c 191 KB