Changeset 29d2197d in ffmpeg

Timestamp:
Feb 19, 2015, 8:53:39 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
b2bbe829
Parents:
e821910a (diff), b727b0ee (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 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'

Conflicts:

tests/fate/audio.mak

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

(No files)

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