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)
* commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b':
  prores: decode alpha plane when it's present
  avfilter: check a malloc in avfilter_link().

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

Simple merge
Simple merge