summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-28 14:42:06 +0200
committerwm4 <wm4@nowhere>2013-06-28 14:42:06 +0200
commit0435ab7131f1bb525a27263b355d341b6d4cf775 (patch)
tree5d52ef13002341e5876b7ad0948f843318b07f7f
parent398722c5a60b36e305d96cd78e5a92e02f43c4b8 (diff)
downloadmpv-0435ab7131f1bb525a27263b355d341b6d4cf775.tar.bz2
mpv-0435ab7131f1bb525a27263b355d341b6d4cf775.tar.xz
options: remove -lavdopts debug suboption
This can be set as avopt instead.
-rw-r--r--DOCS/man/en/options.rst27
-rw-r--r--core/options.h1
-rw-r--r--video/decode/vd_lavc.c4
3 files changed, 1 insertions, 31 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 57af5ff209..e815d6cbbc 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -991,27 +991,6 @@
Only use bit-exact algorithms in all decoding steps (for codec
testing).
- debug=<value>
- Display debugging information.
-
- :0: disabled
- :1: picture info
- :2: rate control
- :4: bitstream
- :8: macroblock (MB) type
- :16: per-block quantization parameter (QP)
- :32: motion vector
- :0x0040: motion vector visualization
- :0x0080: macroblock (MB) skip
- :0x0100: startcode
- :0x0200: PTS
- :0x0400: error resilience
- :0x0800: memory management control operations (H.264)
- :0x1000: bugs
- :0x2000: Visualize quantization parameter (QP), lower QP are tinted
- greener.
- :0x4000: Visualize block types.
-
fast (MPEG-2, MPEG-4, and H.264 only)
Enable optimizations which do not comply to the specification and
might potentially cause problems, like simpler dequantization, simpler
@@ -1019,10 +998,6 @@
assuming YUV 4:2:0 and skipping a few checks to detect damaged
bitstreams.
- idct=<0-99>
- For best decoding quality use the same IDCT algorithm for decoding and
- encoding. This may come at a price in accuracy, though.
-
o=<key>=<value>[,<key>=<value>[,...]]
Pass AVOptions to libavcodec decoder. Note, a patch to make the o=
unneeded and pass all unknown options through the AVOption system is
@@ -1030,7 +1005,7 @@
Some options which used to be direct options can be set with this
mechanism, like ``bug``, ``gray``, ``idct``, ``ec``, ``vismv``,
- ``skip_top`` (was ``st``), ``skip_bottom`` (was ``sb``).
+ ``skip_top`` (was ``st``), ``skip_bottom`` (was ``sb``), ``debug``.
*EXAMPLE*: ``o=debug=pict``
diff --git a/core/options.h b/core/options.h
index 0c6f6c7271..48a51a9c27 100644
--- a/core/options.h
+++ b/core/options.h
@@ -201,7 +201,6 @@ typedef struct MPOpts {
char *hwdec_codecs;
struct lavc_param {
- int debug;
int fast;
char *skip_loop_filter_str;
char *skip_idct_str;
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 540204bcfd..1f5ae68bbf 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -73,7 +73,6 @@ static void uninit(struct sh_video *sh);
#define OPT_BASE_STRUCT struct MPOpts
const m_option_t lavc_decode_opts_conf[] = {
- OPT_INTRANGE("debug", lavc_param.debug, 0, 0, 9999999),
OPT_FLAG_CONSTANTS("fast", lavc_param.fast, 0, 0, CODEC_FLAG2_FAST),
OPT_STRING("skiploopfilter", lavc_param.skip_loop_filter_str, 0),
OPT_STRING("skipidct", lavc_param.skip_idct_str, 0),
@@ -325,9 +324,6 @@ static void init_avctx(sh_video_t *sh, const char *decoder, struct hwdec *hwdec)
avctx->flags |= lavc_param->bitexact;
avctx->flags2 |= lavc_param->fast;
- avctx->debug = lavc_param->debug;
- if (lavc_param->debug)
- av_log_set_level(AV_LOG_DEBUG);
avctx->skip_loop_filter = str2AVDiscard(lavc_param->skip_loop_filter_str);
avctx->skip_idct = str2AVDiscard(lavc_param->skip_idct_str);
avctx->skip_frame = str2AVDiscard(lavc_param->skip_frame_str);