• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8e576d58
    Michael Niedermayer authored
    * qatar/master:
      libavutil: add utility functions to simplify allocation of audio buffers.
      libavutil: add planar sample formats and av_sample_fmt_is_planar()
      avconv: fix segfault at EOF with delayed pictures
      pcmdec: remove unneeded resetting of samples pointer
      avconv: remove a now unused parameter from output_packet().
      avconv: formatting fixes in output_packet()
      avconv: declare some variables in blocks where they are used
      avconv: use the same behavior when decoding audio/video/subs
      bethsoftvideo: return proper consumed size for palette packets.
      cdg: skip packets that don't contain a cdg command.
      crcenc: add flags
      avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
      tiffenc: add a private option for selecting compression algorithm
      md5enc: add flags
      ARM: remove needless .text/.align directives
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/tiffenc.c
    	libavutil/avutil.h
    	libavutil/samplefmt.c
    	libavutil/samplefmt.h
    	tests/ref/fate/bethsoft-vid
    	tests/ref/fate/cdgraphics
    	tests/ref/fate/film-cvid-pcm-stereo-8bit
    	tests/ref/fate/mpeg2-field-enc
    	tests/ref/fate/nuv
    	tests/ref/fate/tiertex-seq
    	tests/ref/fate/tscc-32bit
    	tests/ref/fate/vmnc-32bit
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8e576d58
pcm.c 17.3 KB