diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-01 20:19:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-01 20:19:56 +0100 |
| commit | 8009a51f7bbd90e2a8806be2d8f49f0684037bdb (patch) | |
| tree | 6ac7b78941635688cada93002112767720863735 /libavformat | |
| parent | efc4bfc195dab6efa77b444eac9313df4596a922 (diff) | |
| parent | 46aa75eea1bd68c0e1224ef9ce640b05818572f9 (diff) | |
| download | ffmpeg-8009a51f7bbd90e2a8806be2d8f49f0684037bdb.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: dump format before selecting streams
ffplay: add support for stream specifiers in -ast, -vst, -sst options
ffplay: remove unused no_background from videostate
ffplay: remove flushed state from decoder context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions