[FFmpeg-cvslog] r21473 - in trunk: libavcodec/mjpegdec.c libavcodec/opt.c libavcodec/options.c libavformat/id3v1.c

[stefano]

Author: stefano
Date: Wed Jan 27 01:31:52 2010
New Revision: 21473

Log:
Fix misc typos, patch by
Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==).

Modified:
   trunk/libavcodec/mjpegdec.c
   trunk/libavcodec/opt.c
   trunk/libavcodec/options.c
   trunk/libavformat/id3v1.c

Modified: trunk/libavcodec/mjpegdec.c
==============================================================================
--- trunk/libavcodec/mjpegdec.c	Wed Jan 27 01:26:41 2010	(r21472)
+++ trunk/libavcodec/mjpegdec.c	Wed Jan 27 01:31:52 2010	(r21473)
@@ -964,7 +964,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeConte
     }
 
     if(s->avctx->debug & FF_DEBUG_PICT_INFO)
-        av_log(s->avctx, AV_LOG_DEBUG, "%s %s p:%d >>:%d ilv:%d bits:%d %s\n", s->lossless ? "lossless" : "sequencial DCT", s->rgb ? "RGB" : "",
+        av_log(s->avctx, AV_LOG_DEBUG, "%s %s p:%d >>:%d ilv:%d bits:%d %s\n", s->lossless ? "lossless" : "sequential DCT", s->rgb ? "RGB" : "",
                predictor, point_transform, ilv, s->bits,
                s->pegasus_rct ? "PRCT" : (s->rct ? "RCT" : ""));
 

Modified: trunk/libavcodec/opt.c
==============================================================================
--- trunk/libavcodec/opt.c	Wed Jan 27 01:26:41 2010	(r21472)
+++ trunk/libavcodec/opt.c	Wed Jan 27 01:31:52 2010	(r21473)
@@ -424,7 +424,7 @@ void av_opt_set_defaults2(void *s, int m
             break;
             case FF_OPT_TYPE_INT64:
                 if((double)(opt->default_val+0.6) == opt->default_val)
-                    av_log(s, AV_LOG_DEBUG, "loss of precission in default of %s\n", opt->name);
+                    av_log(s, AV_LOG_DEBUG, "loss of precision in default of %s\n", opt->name);
                 av_set_int(s, opt->name, opt->default_val);
             break;
             case FF_OPT_TYPE_FLOAT: {

Modified: trunk/libavcodec/options.c
==============================================================================
--- trunk/libavcodec/options.c	Wed Jan 27 01:26:41 2010	(r21472)
+++ trunk/libavcodec/options.c	Wed Jan 27 01:31:52 2010	(r21473)
@@ -159,7 +159,7 @@ static const AVOption options[]={
 {"very", "strictly conform to a older more strict version of the spec or reference software", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_VERY_STRICT, INT_MIN, INT_MAX, V|D|E, "strict"},
 {"strict", "strictly conform to all the things in the spec no matter what consequences", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_STRICT, INT_MIN, INT_MAX, V|D|E, "strict"},
 {"normal", NULL, 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_NORMAL, INT_MIN, INT_MAX, V|D|E, "strict"},
-{"inofficial", "allow inofficial extensions", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_INOFFICIAL, INT_MIN, INT_MAX, V|D|E, "strict"},
+{"inofficial", "allow unofficial extensions", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_INOFFICIAL, INT_MIN, INT_MAX, V|D|E, "strict"},
 {"experimental", "allow non standardized experimental things", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_EXPERIMENTAL, INT_MIN, INT_MAX, V|D|E, "strict"},
 {"b_qoffset", "qp offset between P and B frames", OFFSET(b_quant_offset), FF_OPT_TYPE_FLOAT, 1.25, -FLT_MAX, FLT_MAX, V|E},
 {"er", "set error detection aggressivity", OFFSET(error_recognition), FF_OPT_TYPE_INT, FF_ER_CAREFUL, INT_MIN, INT_MAX, A|V|D, "er"},

Modified: trunk/libavformat/id3v1.c
==============================================================================
--- trunk/libavformat/id3v1.c	Wed Jan 27 01:26:41 2010	(r21472)
+++ trunk/libavformat/id3v1.c	Wed Jan 27 01:31:52 2010	(r21473)
@@ -91,7 +91,7 @@ const char * const ff_id3v1_genre_str[ID
      [64] = "Native American",
      [65] = "Cabaret",
      [66] = "New Wave",
-     [67] = "Psychadelic",
+     [67] = "Psychedelic",
      [68] = "Rave",
      [69] = "Showtunes",
      [70] = "Trailer",