diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 17:48:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 17:48:07 +0100 |
| commit | 0500623d5840cd148c85c65a70a42b3b91ffd8e1 (patch) | |
| tree | c333c5bb464236e896ac9db51493d6851c8772ac /doc/ffplay.texi | |
| parent | ad8d063f230c05f8b5efbd05cc5a9f51a2549dcf (diff) | |
| parent | 2dc5980d61493e05ccb04271a685fe804d87b155 (diff) | |
| download | ffmpeg-0500623d5840cd148c85c65a70a42b3b91ffd8e1.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/dualinput: fix shortest option.
lavfi/vf_tile: use av_make_q.
lavfi/avf_concat: use av_make_q.
lavfi/af_amerge: use av_make_q.
lavu/rational: add syntactic sugar.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffplay.texi')
0 files changed, 0 insertions, 0 deletions