diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 22:27:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 22:29:27 +0200 |
| commit | 5771efde87c17e1ecda4db32437d16d108c61be2 (patch) | |
| tree | b4600c7b2ab783c78159e015bf1643fbbcf9436d /libavdevice/avdevice.c | |
| parent | bbee02ed9c186c1bb1fc0c3bcf79e78af978ae6a (diff) | |
| parent | 0ba5299a805e9ccaef1a757381fc2ada4d54b8a1 (diff) | |
| download | ffmpeg-5771efde87c17e1ecda4db32437d16d108c61be2.tar.gz | |
Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'
* commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1':
movenc: use the "encoder" metadata tag to write stsd Compressorname
Conflicts:
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/avdevice.c')
0 files changed, 0 insertions, 0 deletions