Changeset e46cc1da in ffmpeg

Timestamp:
May 29, 2014, 11:30:12 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
4991eacc
Parents:
a72df4da (diff), 43e7f07 (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/29/14 11:26:55)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/29/14 11:30:12)
Message:

Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'

Conflicts:

tests/ref/lavf/flv_fmt
tests/ref/seek/lavf-flv_fmt
tests/ref/seek/vsynth2-flv
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv

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

(No files)

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