aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING.GPLv2
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-24 14:10:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-24 14:10:44 +0200
commit5cf794e0c1f7b651de4b1a61a6786fb71e9679b3 (patch)
treedb09a4fe091885f7c4a86ffe71dab07b4a7f9c5d /COPYING.GPLv2
parent5555d2075a26fc778fb8145473100e94d80a00c8 (diff)
parentd82f188504410fdfa446c5682c128c31bb5851a4 (diff)
downloadffmpeg-5cf794e0c1f7b651de4b1a61a6786fb71e9679b3.tar.gz
Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'
* commit 'd82f188504410fdfa446c5682c128c31bb5851a4': Remove need for padding in av_memcpy_backptr() Conflicts: libavutil/lzo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions