diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-07 16:11:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-07 16:11:25 +0100 |
| commit | c6959918f6ce82ae9a4a60af869f63ffa43f596d (patch) | |
| tree | 2cd570fd9ddcaa1228af4fdff5cd7393e3c2a726 /tools/aviocat.c | |
| parent | e8ac905daea47572abf90c873cd184dbfbbf34a7 (diff) | |
| parent | ad01fae86d80c8a7ac87f6203d87418b898e62ab (diff) | |
| download | ffmpeg-c6959918f6ce82ae9a4a60af869f63ffa43f596d.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: set default window size before starting audio
ffplay: factor out function setting default window size
ffplay: remove no longer necessary codec flush
ffplay: do not wait for flushing the picture queue on flush packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/aviocat.c')
0 files changed, 0 insertions, 0 deletions