aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/bfi.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-23 13:34:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-23 13:34:42 +0200
commita65bc2712db20207dc1065ba3e3e6fa341145d99 (patch)
tree37de357d463df7e920d47d53ea954e4916dfb5f4 /libavcodec/bfi.c
parentc2a25e141e018c6f16b4a2ba3e33f3995bb1a25e (diff)
parent468ea9d5b14f92fe61f47f034e67066f65163f5f (diff)
downloadffmpeg-a65bc2712db20207dc1065ba3e3e6fa341145d99.tar.gz
Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'
* commit '468ea9d5b14f92fe61f47f034e67066f65163f5f': Revert "avutil: make some tables visible again" Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility" Conflicts: libavcodec/sqrt_tab.c libavutil/libavutil.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfi.c')
0 files changed, 0 insertions, 0 deletions