]> git.sesse.net Git - ffmpeg/commit
Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:41:45 +0000 (02:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:42:29 +0000 (02:42 +0200)
commit07f606b4f0149b6515248b9f7b879a59b2008d7e
treecfa26a6e4ec3d76bf92723e6941893b741f74f96
parentf24b7d7616533cd00475d7bf93f3a33ff5ac40dc
parente1ea365f7e1477c78865b866a180712174536c20
Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'

* commit 'e1ea365f7e1477c78865b866a180712174536c20':
  truemotion2: Check memory allocation

Conflicts:
libavcodec/truemotion2.c

See: d49f2603bedb780a6cedff4ac790605679cf4029
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/truemotion2.c