diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-03 21:16:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-03 21:16:31 +0100 |
| commit | 0dd53e14f9684a787d6c66d3cb44afb0a6bb2b7b (patch) | |
| tree | 8cabd5eee3f865caaa4d1f259ea19fe8e2a16139 /tests/ref/acodec/adpcm-ms-trellis | |
| parent | b7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d (diff) | |
| parent | 0af3b65880573aa9b3375362eaab4f84140c7dde (diff) | |
| download | ffmpeg-0dd53e14f9684a787d6c66d3cb44afb0a6bb2b7b.tar.gz | |
Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'
* commit '0af3b65880573aa9b3375362eaab4f84140c7dde':
asf: do not export XMP metadata by default
Conflicts:
libavformat/asfdec.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec/adpcm-ms-trellis')
0 files changed, 0 insertions, 0 deletions