Merge commit '399663be9d4a839b894c48a21b62926eb8497d72'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:32:12 +0000 (13:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:32:16 +0000 (13:32 +0100)
commit28bb17ca362286c92384e466d0c47f702f5d2e3d
tree8715dd7676a1fdfbdaac2651fa47883edbda19c3
parent76f8d3c8d9211daca678747e9521c7ed9e90aba9
parent399663be9d4a839b894c48a21b62926eb8497d72
Merge commit '399663be9d4a839b894c48a21b62926eb8497d72'

* commit '399663be9d4a839b894c48a21b62926eb8497d72':
  lls: mark max_order as unsigned short

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/lls.c
libavutil/lls.h