[FFmpeg-cvslog] Merge commit '183b9d843a9533774fabd3984a52f3987001acbc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 13:45:03 2013 +0200| [fcfbc58a1cd77f3781a52f7517cdd255664da193] | committer: Michael Niedermayer

Merge commit '183b9d843a9533774fabd3984a52f3987001acbc'

* commit '183b9d843a9533774fabd3984a52f3987001acbc':
  ape: Don't allow the seektable to be omitted

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

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