Merge commit '8a0bc405'

* commit '8a0bc405':
  libspeex: support ZygoAudio (quality 10 mode)

Conflicts:
	libavformat/isom.c

See: e26b066c
Merged-by: Michael Niedermayer <michaelni@gmx.at>