falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

CAREFULL --> CAREFUL typo fix 

Originally committed as revision 4590 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 20 years ago
parent
e180129f63
commit
1471c6c2e8
5 changed files with 5 additions and 5 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      doc/ffmpeg-doc.texi
  2. +1
    -1
      ffmpeg.c
  3. +1
    -1
      ffplay.c
  4. +1
    -1
      libavcodec/avcodec.h
  5. +1
    -1
      libavcodec/utils.c

+ 1
- 1
doc/ffmpeg-doc.texi View File

@@ -388,7 +388,7 @@ FF_IDCT_SIMPLEARM
Set error resilience to @var{n}. Set error resilience to @var{n}.
@table @samp @table @samp
@item 1 @item 1
FF_ER_CAREFULL (default)
FF_ER_CAREFUL (default)
@item 2 @item 2
FF_ER_COMPLIANT FF_ER_COMPLIANT
@item 3 @item 3


+ 1
- 1
ffmpeg.c View File

@@ -152,7 +152,7 @@ static float p_mask = 0;
static int qns = 0; static int qns = 0;
static int do_deinterlace = 0; static int do_deinterlace = 0;
static int workaround_bugs = FF_BUG_AUTODETECT; 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 error_concealment = 3;
static int packet_size = 0; static int packet_size = 0;
static int error_rate = 0; static int error_rate = 0;


+ 1
- 1
ffplay.c View File

@@ -216,7 +216,7 @@ static int idct = FF_IDCT_AUTO;
static enum AVDiscard skip_frame= AVDISCARD_DEFAULT; static enum AVDiscard skip_frame= AVDISCARD_DEFAULT;
static enum AVDiscard skip_idct= AVDISCARD_DEFAULT; static enum AVDiscard skip_idct= AVDISCARD_DEFAULT;
static enum AVDiscard skip_loop_filter= 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; static int error_concealment = 3;


/* current context */ /* current context */


+ 1
- 1
libavcodec/avcodec.h View File

@@ -1006,7 +1006,7 @@ typedef struct AVCodecContext {
* - decoding: set by user * - decoding: set by user
*/ */
int error_resilience; int error_resilience;
#define FF_ER_CAREFULL 1
#define FF_ER_CAREFUL 1
#define FF_ER_COMPLIANT 2 #define FF_ER_COMPLIANT 2
#define FF_ER_AGGRESSIVE 3 #define FF_ER_AGGRESSIVE 3
#define FF_ER_VERY_AGGRESSIVE 4 #define FF_ER_VERY_AGGRESSIVE 4


+ 1
- 1
libavcodec/utils.c View File

@@ -544,7 +544,7 @@ static AVOption options[]={
{"EXPERIMENTAL", NULL, 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_EXPERIMENTAL, INT_MIN, INT_MAX, V|E, "strict"}, {"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}, {"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"}, {"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"}, {"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"}, {"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"}, {"VERY_AGGRESSIVE", NULL, 0, FF_OPT_TYPE_CONST, FF_ER_VERY_AGGRESSIVE, INT_MIN, INT_MAX, V|D, "er"},


Write Preview
Loading…
Cancel
Save