diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 22:25:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 22:26:02 +0200 |
| commit | 0f59bba9cb958b134cd32d44d005e69d492a110c (patch) | |
| tree | b3bf8ab646136528c6e3580ade09e127794963d2 /libavcodec/msmpeg4.c | |
| parent | 50daffead2deba9642f0f7069072871adfb75bea (diff) | |
| parent | e281671e21d341a51db3972949d7a77c56a8940f (diff) | |
| download | ffmpeg-0f59bba9cb958b134cd32d44d005e69d492a110c.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: decrease audio_diff_threshold
ffplay: decrease max audio callbacks per second
ffplay: calculate SDL audio buffer size based on sample rate
ffplay: pass simple integers to calculate_display_rect and set_default_window_size
ffplay: eliminate pictq_prev_picture
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4.c')
0 files changed, 0 insertions, 0 deletions