projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
efc4bfc
46aa75e
)
Merge remote-tracking branch 'cus/stable'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 1 Jan 2015 19:19:51 +0000
(20:19 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 1 Jan 2015 19:19:56 +0000
(20:19 +0100)
* 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>
Trivial merge