[FFmpeg-cvslog] Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  1 13:44:27 2013 +0100| [7da1b235e82eb41239cc0f830a42702d037de71f] | committer: Michael Niedermayer

Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7da1b235e82eb41239cc0f830a42702d037de71f
---