diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 03:56:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 03:56:05 +0100 |
| commit | 7ba9f40ac6029ef0922cf50c357d9927d6a181e4 (patch) | |
| tree | 2763dd510a847b26566b2d0ca39f299a5b4ca0f3 /libswscale/output.c | |
| parent | 24c47f00fead6ea9512e7b4f63a54068dd5efeb9 (diff) | |
| parent | f65e57124f8afd7097f52f8ffa8133401f0a0f07 (diff) | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: flush video filters on seek
ffplay: use videoq.serial to detect obsolete frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/output.c')
0 files changed, 0 insertions, 0 deletions