Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 31 Oct 2013 13:27:47 +0000 (14:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 31 Oct 2013 13:27:51 +0000 (14:27 +0100)
commit045214e3d98157d173284e10c412f3976cc55b35
tree89adfd81d92361df2c9d9a7ba36bb0a78280a2c3
parent532ca12300f149a91090270ac733c52c4573ec88
parente4b0a77021a25fd538ef14791e31c06950d5ff1f
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  libavfilter/decimate: Add pts of first frame to all frames.

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