Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Oct 2012 12:30:25 +0000 (14:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Oct 2012 12:30:25 +0000 (14:30 +0200)
commitfadfbb354b30f018338c66712bfe5a6b58970b9a
tree1dc56195c0aba61f396cb679788ced1a3229fb6f
parentd6e87190fd0725f3517493f67dca6f8f264bb370
parent71e92414bfd79e56ea6fff174a665ff7b9b86e68
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>
ffmpeg_opt.c
libavformat/avienc.c
libavformat/riff.c
libavformat/riff.h