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)
* commit '399663be9d4a839b894c48a21b62926eb8497d72':
  lls: mark max_order as unsigned short

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

diff --cc libavutil/lls.c
Simple merge
diff --cc libavutil/lls.h
Simple merge