diff options
author | Michael Niedermayer <[email protected]> | 2012-06-17 23:42:52 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2012-06-17 23:42:56 +0200 |
commit | 564bb244eb6108a8cb09c212d2d56f94d9d0f4c9 (patch) | |
tree | 91a244adc927c2ac74d36ea2c875149a0eccb864 /libavformat/options.c | |
parent | 6ca48ad044e690c43985aa380cb474f1a3df7b4e (diff) | |
parent | db835708757462539ce6c5180ad1c07dbfdd5425 (diff) |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: fix -vismv 1
ffplay: rename buffer source instance from "src" to "ffplay_buffer"
ffplay: use key=val syntax for the buffersrc args
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/options.c')
0 files changed, 0 insertions, 0 deletions