libavformat/movenc.c · 5771efde87c17e1ecda4db32437d16d108c61be2 · libremedia / Tethys / FFmpeg

10 years ago

Michael Niedermayer authored 10 years ago


* commit '0ba5299a':
  movenc: use the "encoder" metadata tag to write stsd Compressorname

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

5771efde

History

Merge commit ''

Michael Niedermayer authored 10 years ago


* commit '0ba5299a':
  movenc: use the "encoder" metadata tag to write stsd Compressorname

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

movenc.c 159.13 KiB