[FFmpeg-cvslog] Merge commit '2ba68dd044ca8fc591139c05563840f546a9c0c0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 13:27:57 2013 +0100| [feba750dcd49e8410a4abaf3fbcc0554452206bc] | committer: Michael Niedermayer

Merge commit '2ba68dd044ca8fc591139c05563840f546a9c0c0'

* commit '2ba68dd044ca8fc591139c05563840f546a9c0c0':
  lavf: remove unreliable timestamp guessing heuristic

Conflicts:
	libavformat/utils.c

Not merged, as the change breaks ABI by removing a field from the middle
of AVStream.
Also, if you have files that decode better or worse without this code please
open a ticket on trac. If the timestamp code turns out useless it of course
should be removed.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=feba750dcd49e8410a4abaf3fbcc0554452206bc
---