[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 19 11:01:59 2013 +0200| [2a5f4c1ea2c787a305cba626e74a535aee480300] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Seek by sector properly

Conflicts:
	libavformat/wtvdec.c

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

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