Changeset 58770db2 in ffmpeg

Timestamp:

Jan 17, 2014, 2:34:24 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

206c06d9

Parents:

5049b6a1 (diff), 33018907 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (01/17/14 14:31:18)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/17/14 14:34:24)

Message:

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>

(No files)