[FFmpeg-cvslog] Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'

Michael Niedermayer git at videolan.org
Mon Jul 29 13:20:28 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 13:14:29 2013 +0200| [f7bc03bcaff5b15e566110f73db0f1fc0d24a717] | committer: Michael Niedermayer

Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'

* commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34':
  lavf: Don't interpret just slightly broken timestamps as wraparound

Conflicts:
	libavformat/utils.c

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

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





More information about the ffmpeg-cvslog mailing list