[SCM] libav/experimental: avcodec: options: Add missing deprecation ifdefs around emu_edge

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bad81800bb51f43d28d656abf5d45b477e3b3198
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sat Aug 2 12:37:49 2014 -0700

    avcodec: options: Add missing deprecation ifdefs around emu_edge

diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index c40a6ce..2ae2dcc 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -64,7 +64,9 @@ static const AVOption avcodec_options[] = {
 {"pass1", "use internal 2-pass ratecontrol in first  pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"},
 {"pass2", "use internal 2-pass ratecontrol in second pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"},
 {"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"},
+#if FF_API_EMU_EDGE
 {"emu_edge", "do not draw edges", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_EMU_EDGE }, INT_MIN, INT_MAX, 0, "flags"},
+#endif
 {"psnr", "error[?] variables will be set during encoding", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_PSNR }, INT_MIN, INT_MAX, V|E, "flags"},
 {"truncated", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_TRUNCATED }, INT_MIN, INT_MAX, 0, "flags"},
 #if FF_API_NORMALIZE_AQP

-- 
Libav/FFmpeg packaging