Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:44:27 +0000 (13:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:44:46 +0000 (13:44 +0100)
* commit '4da950c0ae224b9b8ef952dadf614be2c050023e':
  lls: #ifndef --> #if in FF_API_ version guard

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