Changeset 07f606b4 in ffmpeg

Timestamp:

Jun 1, 2015, 12:42:29 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1dc58965

Parents:

f24b7d76 (diff), e1ea365f (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> (06/01/15 00:41:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/01/15 00:42:29)

Message:

Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'

• commit 'e1ea365f7e1477c78865b866a180712174536c20': truemotion2: Check memory allocation

Conflicts:

libavcodec/truemotion2.c

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

(No files)