diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-27 02:01:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-27 02:01:44 +0200 |
| commit | e4198d2fc3d98d076240530e095608272671f61d (patch) | |
| tree | 2052e35886a69bf0311da8d4250932a88695180d /ffserver.c | |
| parent | 5c616fe48bf65a04a8a708848414f7c2b9c928f7 (diff) | |
| parent | 9fac752afa96b1f52329c6233111549ceb0f9207 (diff) | |
| download | ffmpeg-e4198d2fc3d98d076240530e095608272671f61d.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: simplify and fix flushing out old subtitles on seeking
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions