[FFmpeg-cvslog] Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 23 15:00:27 2012 +0200| [35ce42e07029b3af62f652a53719fee99bb7a5aa] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35ce42e07029b3af62f652a53719fee99bb7a5aa
---