[FFmpeg-cvslog] Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'

Michael Niedermayer git at videolan.org
Wed Oct 17 14:34:11 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 17 14:30:25 2012 +0200| [fadfbb354b30f018338c66712bfe5a6b58970b9a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fadfbb354b30f018338c66712bfe5a6b58970b9a
---





More information about the ffmpeg-cvslog mailing list