• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e4de7167
    Michael Niedermayer authored
    * qatar/master:
      aac_latm: reconfigure decoder on audio specific config changes
      latmdec: fix audio specific config parsing
      Add avcodec_decode_audio4().
      avcodec: change number of plane pointers from 4 to 8 at next major bump.
      Update developers documentation with coding conventions.
      svq1dec: avoid undefined get_bits(0) call
      ARM: h264dsp_neon cosmetics
      ARM: make some NEON macros reusable
      Do not memcpy raw video frames when using null muxer
      fate: update asf seektest
      vp8: flush buffers on size changes.
      doc: improve general documentation for MacOSX
      asf: use packet dts as approximation of pts
      asf: do not call av_read_frame
      rtsp: Initialize the media_type_mask in the rtp guessing demuxer
      Cleaned up alacenc.c
    
    Conflicts:
    	doc/APIchanges
    	doc/developer.texi
    	libavcodec/8svx.c
    	libavcodec/aacdec.c
    	libavcodec/ac3dec.c
    	libavcodec/avcodec.h
    	libavcodec/nellymoserdec.c
    	libavcodec/tta.c
    	libavcodec/utils.c
    	libavcodec/version.h
    	libavcodec/wmadec.c
    	libavformat/asfdec.c
    	tests/ref/seek/lavf_asf
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e4de7167
avconv.c 160 KB