diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-29 04:34:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-29 04:34:27 +0100 |
| commit | ba34e56c0d39e0aa4c93241623b63db81dfef79b (patch) | |
| tree | 0d066a8cd9790caffced15ee88a4c8cd7270a5e4 /libavformat/Makefile | |
| parent | c5bea1b02b16ae7d9b07459da3916b8c6c0322d8 (diff) | |
| parent | 92b50b71a1e4e78fa2828dc2e0a4428674a8a9b0 (diff) | |
| download | ffmpeg-streaming-ba34e56c0d39e0aa4c93241623b63db81dfef79b.zip ffmpeg-streaming-ba34e56c0d39e0aa4c93241623b63db81dfef79b.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: fix type of time_diff in waveform display
ffplay: always display audio visualization if mode is set
ffplay: hide cursor on no mouse movement
ffplay: reset external clock to unknown on start
ffplay: only drop frames if not in frame step mode
ffplay: move frame step pause from the video thread to video_refresh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
0 files changed, 0 insertions, 0 deletions
