Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 11:41:25 +0000 (13:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 11:41:47 +0000 (13:41 +0200)
commit849bb62c2c9afdb1e81f44870645a6990c4ce1fc
tree21436d8d1eb3e9d7fbfe74804fabb976d45d149d
parentd56ced5fbf3c76ebd5c5b015695101c634e53e4a
parentcebdedca57d95834a8f8098c7b6a322a1163e26b
Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'

* commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b':
  prores: decode alpha plane when it's present
  avfilter: check a malloc in avfilter_link().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/proresdec_lgpl.c
libavfilter/avfilter.c