Changeset e932ae5 in ffmpeg

Timestamp:

Jul 9, 2014, 8:38:13 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d52f874c

Parents:

1b58f137 (diff), d5cf5afa (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/09/14 20:37:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/09/14 20:38:13)

Message:

Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'

• commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6': adxdec: get rid of an avpriv function

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

(No files)