Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 13:00:27 +0000 (15:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 13:00:27 +0000 (15:00 +0200)
commit35ce42e07029b3af62f652a53719fee99bb7a5aa
tree455a7ab81008cbbfa9cd3c14468c2b28f2bd6206
parentd0ac26a264e5b9d5d7d19efddd7205faf1e124d4
parent8b8899ac3233b4f7af83ded0dc032fad8902d714
Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
  fate: Declare avcodec/avformat deps in the respective Makefile snippets
  fate: Add dependencies for WMA and WavPack tests
  Improve wording and spelling of av_log_missing_feature messages.
  lavu: remove disabled FF_API_AV_FIFO_PEEK cruft

Conflicts:
libavcodec/aacsbr.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libavcodec/aacdec.c
libavcodec/aacsbr.c
libavcodec/eac3dec.c
libavcodec/flacdec.c
libavcodec/flashsv.c
libavcodec/proresdec_lgpl.c
libavcodec/wmalosslessdec.c
libavformat/oggparseskeleton.c
libavformat/spdifdec.c
libavutil/fifo.h
libavutil/version.h
tests/Makefile