Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 14:04:41 +0000 (15:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 14:04:41 +0000 (15:04 +0100)
commitfc2922836bc289e443c0c7a20450bf8f03c0785d
tree20843987f14580004c6f67314783eb39d00e2e93
parent25be63005f0ba0b4cb8bf2569202ad0e89b4dae3
parent0b55b16abc15c3fad0ae8b7cedc8f63f1162e89c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter: allow setpts filter to use wallclock time for calculations

Conflicts:
doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/f_setpts.c