[FFmpeg-cvslog] Merge commit '7cade8ea2bb19e78dae42b29720535a70fb2ae84'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 23 23:03:17 2014 +0200| [417ae6281b9bddc24e1f5f11632079ff0f4639ef] | committer: Michael Niedermayer

Merge commit '7cade8ea2bb19e78dae42b29720535a70fb2ae84'

* commit '7cade8ea2bb19e78dae42b29720535a70fb2ae84':
  on2avc: change a comment at #endif to match actual define

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

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