diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 00:57:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 00:57:04 +0200 |
| commit | 9e214900ad3133d764893b42de7a1558d38c870c (patch) | |
| tree | 51a84ef820a5267765f7c70ca4717c866fe2606f /libavformat/metadata.c | |
| parent | 49f441ea8991c720a382f66cec031ab7a5a4f2db (diff) | |
| parent | f07cb53ab95172f7c15e14b004c4ebcb04aad44c (diff) | |
| download | ffmpeg-9e214900ad3133d764893b42de7a1558d38c870c.tar.gz | |
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>
Diffstat (limited to 'libavformat/metadata.c')
0 files changed, 0 insertions, 0 deletions