diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:53:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:53:19 +0200 |
| commit | 0724b4a16d6b88b311610e96c7ba341a4b33965d (patch) | |
| tree | 4e80fea21e5c1dd58bb706cecb95283f81e8846f /libavcodec/xwdenc.c | |
| parent | 944ad46182483ff52573ec3c827c86058b225d16 (diff) | |
| parent | 62844c3fd66940c7747e9b2bb7804e265319f43f (diff) | |
| download | ffmpeg-0724b4a16d6b88b311610e96c7ba341a4b33965d.tar.gz | |
Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'
* commit '62844c3fd66940c7747e9b2bb7804e265319f43f':
h264: Integrate clear_blocks calls with IDCT
Conflicts:
libavcodec/arm/h264idct_neon.S
libavcodec/h264idct_template.c
libavcodec/x86/h264_idct.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xwdenc.c')
0 files changed, 0 insertions, 0 deletions