diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:00:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:13:20 +0100 |
| commit | 781a5a392c4d0da5250c28a153c14f88aad09a73 (patch) | |
| tree | 880b27be8532207156741ac4fc5c89a4a5feeec3 /libavutil/arm/float_dsp_arm.h | |
| parent | 302ed9c43f2d2a0764a9f9d2a4b2e512d2c9592f (diff) | |
| parent | e352b293712ff7cbde67eba3ce3f8510b037de09 (diff) | |
| download | ffmpeg-781a5a392c4d0da5250c28a153c14f88aad09a73.tar.gz | |
Merge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'
* commit 'e352b293712ff7cbde67eba3ce3f8510b037de09':
mov: Add an option for exporting all metadata
Conflicts:
libavformat/isom.h
libavformat/mov.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/float_dsp_arm.h')
0 files changed, 0 insertions, 0 deletions