CAREFULL --> CAREFUL typo fix

Originally committed as revision 4590 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index ba4a487..e93e2aa 100644 (file)
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -388,7 +388,7 @@ FF_IDCT_SIMPLEARM
 Set error resilience to @var{n}.
 @table @samp
 @item 1 
-FF_ER_CAREFULL (default)
+FF_ER_CAREFUL (default)
 @item 2
 FF_ER_COMPLIANT
 @item 3

diff --git a/ffmpeg.c b/ffmpeg.c
index 553f8e0..70372af 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -152,7 +152,7 @@ static float p_mask = 0;
 static int qns = 0;
 static int do_deinterlace = 0;
 static int workaround_bugs = FF_BUG_AUTODETECT;
-static int error_resilience = FF_ER_CAREFULL;
+static int error_resilience = FF_ER_CAREFUL;
 static int error_concealment = 3;
 static int packet_size = 0;
 static int error_rate = 0;

diff --git a/ffplay.c b/ffplay.c
index 967ad1f..7c3509a 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -216,7 +216,7 @@ 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_resilience = FF_ER_CAREFULL;
+static int error_resilience = FF_ER_CAREFUL;
 static int error_concealment = 3;
 
 /* current context */

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7542e64..826329f 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1006,7 +1006,7 @@ typedef struct AVCodecContext {
      * - decoding: set by user
      */
     int error_resilience;
-#define FF_ER_CAREFULL        1
+#define FF_ER_CAREFUL         1
 #define FF_ER_COMPLIANT       2
 #define FF_ER_AGGRESSIVE      3
 #define FF_ER_VERY_AGGRESSIVE 4

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 562f0ef..3eb1e60 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -544,7 +544,7 @@ static AVOption options[]={
 {"EXPERIMENTAL", NULL, 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_EXPERIMENTAL, INT_MIN, INT_MAX, V|E, "strict"},
 {"b_quant_offset", NULL, OFFSET(b_quant_offset), FF_OPT_TYPE_FLOAT, DEFAULT, FLT_MIN, FLT_MAX, V|E},
 {"error_resilience", NULL, OFFSET(error_resilience), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D, "er"},
-{"CAREFULL", NULL, 0, FF_OPT_TYPE_CONST, FF_ER_CAREFULL, INT_MIN, INT_MAX, V|D, "er"},
+{"CAREFUL", NULL, 0, FF_OPT_TYPE_CONST, FF_ER_CAREFUL, INT_MIN, INT_MAX, V|D, "er"},
 {"COMPLIANT", NULL, 0, FF_OPT_TYPE_CONST, FF_ER_COMPLIANT, INT_MIN, INT_MAX, V|D, "er"},
 {"AGGRESSIVE", NULL, 0, FF_OPT_TYPE_CONST, FF_ER_AGGRESSIVE, INT_MIN, INT_MAX, V|D, "er"},
 {"VERY_AGGRESSIVE", NULL, 0, FF_OPT_TYPE_CONST, FF_ER_VERY_AGGRESSIVE, INT_MIN, INT_MAX, V|D, "er"},