diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 11:33:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 11:33:51 +0100 |
| commit | ed25ca16617121b382a961980707844fafcf82f8 (patch) | |
| tree | ea582f538fe589342d6f861a164901627fd68941 /libavcodec/adx.h | |
| parent | bcccb2c2986bca9307b66a8d681addad54c786ff (diff) | |
| parent | b67138598ce158e3083f6295a27b63e2065d5ecb (diff) | |
| download | ffmpeg-ed25ca16617121b382a961980707844fafcf82f8.tar.gz | |
Merge commit 'b67138598ce158e3083f6295a27b63e2065d5ecb'
* commit 'b67138598ce158e3083f6295a27b63e2065d5ecb':
vc1: Simplify a little setting the intra variables
Conflicts:
libavcodec/vc1_block.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adx.h')
0 files changed, 0 insertions, 0 deletions