Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Oct 2012 13:40:22 +0000 (14:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Oct 2012 13:40:22 +0000 (14:40 +0100)
commite79c3858b35fcc77c68c33b627958e736686957e
tree5f933517c2909def4e2930a409b0a460eb4f41fd
parentcd37963684d8ee9819af15ccebe09d84839101dd
parent14f031d7ecfabba0ef02776d4516aa3dcb7c40d8
Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'

* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
  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: Michael Niedermayer <michaelni@gmx.at>
16 files changed:
configure
doc/filters.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/cngdec.c
libavcodec/cngenc.c
libavcodec/codec_desc.c
libavcodec/lpc.c
libavcodec/lpc.h
libavcodec/version.h
libavfilter/af_ashowinfo.c
libavfilter/version.h
libavformat/dv.c
libavutil/avutil.h
tests/fate/ac3.mak