Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 14:31:18 +0000 (15:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 14:34:24 +0000 (15:34 +0100)
commit58770db2ae67d9b4b6adcf2b15951f9608442051
treea155b0f27369b59cfa7651a4a1ecd6627d3d8a58
parent5049b6a1fe52f549bad6721f162b4ec2d9d0a357
parent33018907bd07b34e0e70d5ae12097265eb3734d7
Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'

* commit '33018907bd07b34e0e70d5ae12097265eb3734d7':
  mp3enc: allow omitting the id3v2 header with -id3v2_version 0

Conflicts:
doc/muxers.texi
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers.texi
libavformat/mp3enc.c
libavformat/version.h