Changeset c04961fa in ffmpeg

Timestamp:

Apr 11, 2014, 5:24:03 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

671f908

Parents:

d2417061 (diff), b9dea237 (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> (04/11/14 17:19:15)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/11/14 17:24:03)

Message:

Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'

• commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f': resample: fix avresample_get_delay() return value

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

(No files)