Merge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Oct 2014 22:52:46 +0000 (00:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Oct 2014 22:56:26 +0000 (00:56 +0200)
* 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>

Trivial merge