Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Jan 2012 15:40:49 +0000 (16:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Jan 2012 15:41:06 +0000 (16:41 +0100)
commit0b4f1e0d3db363bd9b04c7cef0c941a425714690
treeeafd873f57619754542734cfc0a132d58a45681b
parent4057505e28a4a3a4e3b3a3a404def16e36ea2eec
parent1348420b8ae87f19e1659a9a50e74df6e3791b57
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: silence buffer size must be a multiple of frame size
  ffplay: use swr_set_compensation for audio synchronization

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