diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:13:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:13:05 +0200 |
| commit | 7426acff1aed209bc7db4c87697a5931e177eaf1 (patch) | |
| tree | e61531c6a0f689f94d98ffeb7fca8e921bb390e5 /libavformat/jvdec.c | |
| parent | e77b9853ea66ef6c34b04d121c5b3d1afaa33971 (diff) | |
| parent | 18f2514c4037befd37b02e4d4f10c159edf3b26f (diff) | |
| download | ffmpeg-7426acff1aed209bc7db4c87697a5931e177eaf1.tar.gz | |
Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'
* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f':
mov: export stsd Compressorname in metadata
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jvdec.c')
0 files changed, 0 insertions, 0 deletions