[FFmpeg-cvslog] Merge commit 'bad81800bb51f43d28d656abf5d45b477e3b3198'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug  3 19:45:25 2014 +0200| [76aec9e6b4a2aabe659013198620276822420ad9] | committer: Michael Niedermayer

Merge commit 'bad81800bb51f43d28d656abf5d45b477e3b3198'

* commit 'bad81800bb51f43d28d656abf5d45b477e3b3198':
  avcodec: options: Add missing deprecation ifdefs around emu_edge

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

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