diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 11:49:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 11:50:12 +0100 |
| commit | 81754d8f8b778e9fcc11c2909641a4b862739faf (patch) | |
| tree | c0dba1f1da6d3f03b5452cb538f3b2bc31e6986c /libavutil/arm/float_dsp_init_neon.c | |
| parent | 36e6842aa63f9cbad3399b26b871589d1258ee43 (diff) | |
| parent | aa7a19b41774ce5f8a4e43f3692a4f9d90aa5c92 (diff) | |
| download | ffmpeg-81754d8f8b778e9fcc11c2909641a4b862739faf.tar.gz | |
Merge commit 'aa7a19b41774ce5f8a4e43f3692a4f9d90aa5c92' into release/2.4
* commit 'aa7a19b41774ce5f8a4e43f3692a4f9d90aa5c92':
mjpegdec: check for pixel format changes
Conflicts:
libavcodec/mjpegdec.c
See: 5c378d6a6df8243f06c87962b873bd563e58cd39
See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/float_dsp_init_neon.c')
0 files changed, 0 insertions, 0 deletions