[FFmpeg-cvslog] lavd/libcdio: add more paranoia mode constants

Stefano Sabatini git at videolan.org
Sat Jan 31 11:36:48 CET 2015


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Fri Jan 30 18:30:17 2015 +0100| [c8bec255eff3f1f612cfa39c871bdb0c3585a340] | committer: Stefano Sabatini

lavd/libcdio: add more paranoia mode constants

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

 libavdevice/libcdio.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
index 8bb95e6..9e9b0d8 100644
--- a/libavdevice/libcdio.c
+++ b/libavdevice/libcdio.c
@@ -165,10 +165,12 @@ static int read_seek(AVFormatContext *ctx, int stream_index, int64_t timestamp,
 #define DEC AV_OPT_FLAG_DECODING_PARAM
 static const AVOption options[] = {
     { "speed",              "set drive reading speed", OFFSET(speed),         AV_OPT_TYPE_INT,   { .i64 = 0 }, 0,       INT_MAX, DEC },
-    { "paranoia_mode",      "set error recovery mode", OFFSET(paranoia_mode), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, DEC, "paranoia_mode" },
+    { "paranoia_mode",      "set error recovery mode", OFFSET(paranoia_mode), AV_OPT_TYPE_FLAGS, { .i64 = PARANOIA_MODE_DISABLE }, INT_MIN, INT_MAX, DEC, "paranoia_mode" },
+        { "disable",        "apply no fixups",                      0,    AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_DISABLE },   0, 0, DEC, "paranoia_mode" },
         { "verify",         "verify data integrity in overlap area", 0,   AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_VERIFY },    0, 0, DEC, "paranoia_mode" },
         { "overlap",        "perform overlapped reads",             0,    AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_OVERLAP },   0, 0, DEC, "paranoia_mode" },
         { "neverskip",      "do not skip failed reads",             0,    AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_NEVERSKIP }, 0, 0, DEC, "paranoia_mode" },
+        { "full",           "apply all recovery modes",             0,    AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_FULL },      0, 0, DEC, "paranoia_mode" },
     { NULL },
 };
 



More information about the ffmpeg-cvslog mailing list