Changeset d8901c2f in ffmpeg

Timestamp:
Feb 14, 2015, 9:02:41 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ad0be703
Parents:
6998400c (diff), b339019d (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> (02/14/15 20:48:32)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/14/15 21:02:41)
Message:

Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'

Conflicts:

libavcodec/Makefile
libavcodec/dcadec.c

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

(No files)

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