Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Oct 2013 09:01:59 +0000 (11:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Oct 2013 09:11:34 +0000 (11:11 +0200)
commit2a5f4c1ea2c787a305cba626e74a535aee480300
tree7685456045442ffcfe4e7e2bd4ff3c3248b5aab4
parent5d2a83571b0a3beaeced8ec3538159507fa7b96c
parent2b72f8ac320c8c5087b1bd0589fc3df132eb42bc
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Seek by sector properly

Conflicts:
libavformat/wtvdec.c

See: a0d13d84a928110b0e99ea16d17fd758fcbde35f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/wtv.h
libavformat/wtvdec.c