From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 9 Jul 2013 22:57:00 +0000 (+0200)
Subject: Merge remote-tracking branch 'cus/stable'
X-Git-Tag: android-x86-4.4-r1~2443
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9e214900ad3133d764893b42de7a1558d38c870c;p=android-x86%2Fexternal-ffmpeg.git

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>
---

9e214900ad3133d764893b42de7a1558d38c870c