Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 22:57:00 +0000 (00:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 22:57:04 +0000 (00:57 +0200)
commit9e214900ad3133d764893b42de7a1558d38c870c
tree51a84ef820a5267765f7c70ca4717c866fe2606f
parent49f441ea8991c720a382f66cec031ab7a5a4f2db
parentf07cb53ab95172f7c15e14b004c4ebcb04aad44c
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: assume 0 stream start time if start time is unset in duration check
  ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE

Merged-by: Michael Niedermayer <michaelni@gmx.at>