[FFmpeg-cvslog] Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 11 01:43:00 2015 +0100| [702cf8d0de9e31c0bc62b6a671dfc54411b22fd6] | committer: Michael Niedermayer

Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'

* commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c':
  lavf: remove unused code

Conflicts:
	libavformat/seek.c
	libavformat/seek.h

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

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