aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dcadsp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-21 16:56:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-21 16:56:22 +0200
commit6e3830cca297996736784016a8bc908f8cb98cf3 (patch)
tree6fc159bb36e4aa048d851a3892b7c33d88124721 /libavcodec/dcadsp.h
parent6a356801952b6c38042ef267808dbacbdb700eef (diff)
parentd21bf0d27b547adcaabaa28d475e6b9f97dfe20a (diff)
downloadffmpeg-6e3830cca297996736784016a8bc908f8cb98cf3.tar.gz
Merge commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a' into release/1.1
* commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a': resample: fix avresample_get_delay() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadsp.h')
0 files changed, 0 insertions, 0 deletions