Merge commit 'bd239c9a'

* commit 'bd239c9a':
  lavf: Don't drop both pts and dts if timestamps are invalid

Conflicts:
	libavformat/utils.c
	tests/ref/fate/vc1-ism

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