diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 16:10:44 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 16:10:44 +0400 |
| commit | 5cf794e0c1f7b651de4b1a61a6786fb71e9679b3 (patch) | |
| tree | db09a4fe091885f7c4a86ffe71dab07b4a7f9c5d /.gitignore | |
| parent | 5555d2075a26fc778fb8145473100e94d80a00c8 (diff) | |
| parent | d82f188504410fdfa446c5682c128c31bb5851a4 (diff) | |
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 '.gitignore')
0 files changed, 0 insertions, 0 deletions