summaryrefslogtreecommitdiff
path: root/libavformat/log2_tab.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-18 22:16:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-18 22:16:04 +0200
commit521f5697348d96ac7c725bc2cba14d6ce4944334 (patch)
tree6ab1a8b2b02141859532a4b5d9e35d5a3188e02d /libavformat/log2_tab.c
parent42d326353c17085a98f0e81844f0c6320d70e8f3 (diff)
parent8b0dd4942aac320d1ca3c40fa7ea1be342c71273 (diff)
downloadffmpeg-521f5697348d96ac7c725bc2cba14d6ce4944334.tar.gz
Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'
* commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273': idctdsp: prettyprinting cosmetics Conflicts: libavcodec/idctdsp.c libavcodec/ppc/idctdsp.c libavcodec/x86/idctdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/log2_tab.c')
0 files changed, 0 insertions, 0 deletions