[FFmpeg-cvslog] Merge commit '8692d74b7364b405d7939c0ed347e8a2815193a7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 18 21:14:52 2015 +0100| [b3818c47d8ba3cdae5e924afde797123352ce2a5] | committer: Michael Niedermayer

Merge commit '8692d74b7364b405d7939c0ed347e8a2815193a7'

* commit '8692d74b7364b405d7939c0ed347e8a2815193a7':
  mov: Add option to keep exact packet sequence after seeking

Conflicts:
	libavformat/isom.h
	libavformat/mov.c
	libavformat/version.h

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

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