Changeset 5049b6a1 in ffmpeg

Timestamp:
Jan 17, 2014, 2:23:11 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
58770db2
Parents:
045d8007 (diff), f9cc6883 (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.
Message:

Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'

Conflicts:

doc/muxers.texi
libavformat/mp3enc.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.