Michael Niedermayer fadfbb354b Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68' ...

* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
  lavf: move RIFF INFO tag writing from avienc to riff
  avconv: fix disabling auto mappings with -map_metadata

Conflicts:
	ffmpeg_opt.c
	libavformat/riff.h

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

2012-10-17 14:30:25 +02:00

97 KiB

Raw Blame History

View Raw