Merge commit 'bad81800bb51f43d28d656abf5d45b477e3b3198'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 17:45:25 +0000 (19:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 17:45:38 +0000 (19:45 +0200)
* commit 'bad81800bb51f43d28d656abf5d45b477e3b3198':
  avcodec: options: Add missing deprecation ifdefs around emu_edge

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/options_table.h

Simple merge