Merge commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0' * commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0': Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
Merge commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0' * commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0': Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)