Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 20:00:58 +0000 (22:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 20:01:05 +0000 (22:01 +0200)
* 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>

Trivial merge