Don't overwrite user-supplied metadata with metadata mapped from an input file.
authorAnton Khirnov <wyskas@gmail.com>
Mon, 5 Apr 2010 19:53:25 +0000 (19:53 +0000)
committerRonald S. Bultje <rsbultje@gmail.com>
Mon, 5 Apr 2010 19:53:25 +0000 (19:53 +0000)
commit1a6498d78c86b796295877f44ea82ebe8b5d5328
treefbead4844c55abd95675afd9c82b367e75633ee0
parent56a8242fdd46a5dc6e577ec730b549e83facf6a6
Don't overwrite user-supplied metadata with metadata mapped from an input file.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22808 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c