Changeset b96dddd3 in ffmpeg

Timestamp:

Oct 28, 2013, 8:59:53 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

89306378

Parents:

6baf9c44 (diff), 211ca69b (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> (10/28/13 08:59:49)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/28/13 08:59:53)

Message:

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

• commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5': lavr: check that current_buffer is not NULL before using it

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

(No files)