diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-14 16:40:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-14 16:41:06 +0100 |
| commit | 0b4f1e0d3db363bd9b04c7cef0c941a425714690 (patch) | |
| tree | eafd873f57619754542734cfc0a132d58a45681b /libavformat | |
| parent | 4057505e28a4a3a4e3b3a3a404def16e36ea2eec (diff) | |
| parent | 1348420b8ae87f19e1659a9a50e74df6e3791b57 (diff) | |
| download | ffmpeg-0b4f1e0d3db363bd9b04c7cef0c941a425714690.tar.gz | |
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>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions