diff options
author | Michael Niedermayer <[email protected]> | 2015-07-23 12:35:10 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2015-07-23 12:35:10 +0200 |
commit | b04b021005508e190ad02b66106c2c611b404a72 (patch) | |
tree | a82dcb03f05755ff42f795f9def66587b24eed8c /libavutil/mips/generic_macros_msa.h | |
parent | 157fa73992ab30b32160034e115aac21808084e2 (diff) | |
parent | ae5a8dca675ee544178225256893e679b750cb63 (diff) |
Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'
* commit 'ae5a8dca675ee544178225256893e679b750cb63':
hap: Fix slice size computation
Conflicts:
libavcodec/hapdec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/mips/generic_macros_msa.h')
0 files changed, 0 insertions, 0 deletions