diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-06 15:33:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-06 15:33:54 +0100 |
| commit | c73445a45cdb6cc8c29f411fbf314500e48cf3b5 (patch) | |
| tree | 8f1d6af7d37e4ab8d783bf008799a7e26bbe2d4b /ffmpeg_vdpau.c | |
| parent | 9c978f243a47a0906fb32d723fcdd37d7b8cee93 (diff) | |
| parent | 49ec5515956405a240b0f2a092d927104874b16a (diff) | |
| download | ffmpeg-c73445a45cdb6cc8c29f411fbf314500e48cf3b5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp8: Use 2 registers for dst_stride and src_stride in neon bilin filter
Conflicts:
libavcodec/arm/vp8dsp_neon.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_vdpau.c')
0 files changed, 0 insertions, 0 deletions