• Michael Niedermayer's avatar
    Merge commit '14f031d7' · e79c3858
    Michael Niedermayer authored
    * commit '14f031d7':
      dv: use AVStream.index instead of abusing AVStream.id
      lavfi: add ashowinfo filter
      avcodec: Add a RFC 3389 comfort noise codec
      lpc: Add a function for calculating reflection coefficients from samples
      lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
      lavr: document upper bound on number of output samples.
      lavr: add general API usage doxy
      indeo3: remove duplicate capabilities line.
      fate: ac3: Add dependencies
    
    Conflicts:
    	Changelog
    	doc/filters.texi
    	libavcodec/Makefile
    	libavcodec/allcodecs.c
    	libavcodec/avcodec.h
    	libavcodec/codec_desc.c
    	libavcodec/version.h
    	libavfilter/Makefile
    	libavfilter/af_ashowinfo.c
    	libavfilter/allfilters.c
    	libavfilter/version.h
    	libavutil/avutil.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e79c3858
lpc.h 5.79 KB