diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 01:29:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 01:32:05 +0100 |
| commit | 1d8e97c79c2dc1100822f7cacc71295f7fc7fb0a (patch) | |
| tree | 2bf331b1963b0d90338efc9097e0a243cbc5e60d /libavutil/aarch64/float_dsp_neon.S | |
| parent | 543a46e0d1f32ab162f2dc9fd0233d9831b6f805 (diff) | |
| parent | 8f45bd1433a1d8534d7b3997219c4ca31a669042 (diff) | |
| download | ffmpeg-1d8e97c79c2dc1100822f7cacc71295f7fc7fb0a.tar.gz | |
Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'
* commit '8f45bd1433a1d8534d7b3997219c4ca31a669042':
libopenjpeg: Support rgba64 encoding
Conflicts:
libavcodec/libopenjpegenc.c
See: 36397ea1c7e27ab850149cc61394c2baa26dd532
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aarch64/float_dsp_neon.S')
0 files changed, 0 insertions, 0 deletions