Changeset 32b2b7bd in ffmpeg

Timestamp:

Feb 17, 2015, 8:09:11 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

79216a1

Parents:

15cd2a93 (diff), 266f2411 (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/17/15 20:08:33)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/17/15 20:09:11)

Message:

Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'

• commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97': avplay: Check frame allocation inside video_thread()

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

(No files)