summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-21 13:29:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-21 13:35:42 +0200
commitdcbff35199e1596d9d1200e734ef4a4c306e50f1 (patch)
treee173e3208ed6a79a0648e4324c3cc398b7d176ca /libavcodec/ffv1.c
parent05f228b0a01e8b97ba73a15c1eccb6b0a9060633 (diff)
parentd15c21e5fa3961f10026da1a3080a3aa3cf4cec9 (diff)
Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'
* commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9': avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility avutil: make some tables visible again avutil: remove inline av_log2 from public API celp_math: rename ff_log2 to ff_log2_q15 Conflicts: libavutil/libavutil.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.c')
0 files changed, 0 insertions, 0 deletions