Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 12:51:16 +0000 (13:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 12:51:20 +0000 (13:51 +0100)
commit593f5c0f3c559a558efcb10a955cbac499e1fdbb
tree82ce1769739747df73b922d4bf4ffb903060db5c
parent5c78a8129c4bac2ae0c12d90672799325bc01e96
parent8083332c2de9ee189f96844ff4c2d9be1844116f
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@gmx.at>
libavcodec/vp6.c
libavfilter/af_asyncts.c