[FFmpeg-cvslog] Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 13:51:16 2012 +0100| [593f5c0f3c559a558efcb10a955cbac499e1fdbb] | committer: Michael Niedermayer

Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'

* commit '8083332c2de9ee189f96844ff4c2d9be1844116f':
  asyncts: use clipped delta value when setting resample compensation
  asyncts: fix flushing of final samples at EOF
  vp6: properly fail on unsupported feature

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

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