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)
commit7da1b235e82eb41239cc0f830a42702d037de71f
treefb28d36a528ff9b3ef137d43fe9e040ecb3dd00d
parent1a7166a58d697ac43eda546f4ccbddeb0e078196
parent4da950c0ae224b9b8ef952dadf614be2c050023e
Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'

* commit '4da950c0ae224b9b8ef952dadf614be2c050023e':
  lls: #ifndef --> #if in FF_API_ version guard

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