diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-12 00:52:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-12 00:56:26 +0200 |
| commit | bec077a1ab1fe19d8cb7a9cafd9731546d449c4b (patch) | |
| tree | cf81083be395c5636616bdf5a863bcfea84d3849 /tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a | |
| parent | 0db1f2c2c78db18999fccd46a156408e5e87c8a1 (diff) | |
| parent | bd239c9a2e151c0aeeb653a571f130aae7320894 (diff) | |
| download | ffmpeg-bec077a1ab1fe19d8cb7a9cafd9731546d449c4b.tar.gz | |
Merge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894'
* commit 'bd239c9a2e151c0aeeb653a571f130aae7320894':
lavf: Don't drop both pts and dts if timestamps are invalid
Conflicts:
libavformat/utils.c
tests/ref/fate/vc1-ism
See: cd6851c5ef281e44af7028e08597c4dfb73d880f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a')
0 files changed, 0 insertions, 0 deletions