Changeset a550926 in ffmpeg

Timestamp:
Jul 24, 2013, 8:31:10 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
82654172
Parents:
865f3482 (diff), ca488ad4 (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> (07/24/13 08:28:38)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/24/13 08:31:10)
Message:

Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'

Conflicts:

libavcodec/alsdec.c

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

(No files)

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