diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 22:00:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 22:01:05 +0200 |
| commit | eda61abc846bb4a37fbfeb8f3215ced19da7d6e0 (patch) | |
| tree | f933c91437ea394a28d251c2b7aa30d74e0053d3 /COPYING.GPLv2 | |
| parent | 4824aea7afd42ed8bac3e330022f023dd93624fa (diff) | |
| parent | b8facbeecb66a4bce59dbf76a97518283609eb55 (diff) | |
| download | ffmpeg-eda61abc846bb4a37fbfeb8f3215ced19da7d6e0.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: only do early frame drop if video queue is not empty
ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0
ffplay: simplify aspect ratio calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions