Changeset ca35037 in ffmpeg

Timestamp:
Jun 23, 2014, 1:34:13 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
56afbe8d
Parents:
2bcf34a0 (diff), f2f2e762 (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 'f2f2e7627f0c878d13275af5d166ec5932665e28'

Conflicts:

libavformat/mp3enc.c

See: 2dd0da787ce5008d4d1b8f461fbd1288c32e2c38
Merged-by: Michael Niedermayer <michaelni@gmx.at>

(No files)

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