From 75e2025f57fef5060d74c65d9654e61c35bd6c81 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 22 Jan 2012 10:51:26 +0100 Subject: avplay: remove the -er option. Error recognition flags can and should be set directly with AVOptions. --- avplay.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'avplay.c') diff --git a/avplay.c b/avplay.c index 432afc11b3..27ac01ae33 100644 --- a/avplay.c +++ b/avplay.c @@ -251,7 +251,6 @@ static int idct = FF_IDCT_AUTO; static enum AVDiscard skip_frame = AVDISCARD_DEFAULT; static enum AVDiscard skip_idct = AVDISCARD_DEFAULT; static enum AVDiscard skip_loop_filter = AVDISCARD_DEFAULT; -static int error_recognition = FF_ER_CAREFUL; static int error_concealment = 3; static int decoder_reorder_pts = -1; static int autoexit; @@ -2187,7 +2186,6 @@ static int stream_component_open(VideoState *is, int stream_index) avctx->skip_frame = skip_frame; avctx->skip_idct = skip_idct; avctx->skip_loop_filter = skip_loop_filter; - avctx->error_recognition = error_recognition; avctx->error_concealment = error_concealment; avctx->thread_count = thread_count; @@ -2992,7 +2990,6 @@ static const OptionDef options[] = { { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_frame }, "", "" }, { "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_idct }, "", "" }, { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&idct }, "set idct algo", "algo" }, - { "er", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&error_recognition }, "set error detection threshold (0-4)", "threshold" }, { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&error_concealment }, "set error concealment options", "bit_mask" }, { "sync", HAS_ARG | OPT_EXPERT, { (void*)opt_sync }, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "threads", HAS_ARG | OPT_EXPERT, { (void*)opt_thread_count }, "thread count", "count" }, -- cgit v1.2.3