Changeset eacf7d65 in ffmpeg

Timestamp:
May 15, 2014, 5:16:57 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
f478e850
Parents:
beeb7551 (diff), 0c1959b0 (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> (05/15/14 16:51:57)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/15/14 17:16:57)
Message:

Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'

Conflicts:

doc/APIchanges
libavformat/avformat.h
libavformat/flacenc.c
libavformat/movenc.c
libavformat/oggenc.c
libavformat/options_table.h
libavformat/version.h
tests/fate/video.mak

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

(No files)

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