Originally committed as revision 8114 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun authored on 2007/02/24 18:41:43... | ... |
@@ -31,7 +31,7 @@ intreadwrite.h reading and writing of unaligned big/little/native-endia |
31 | 31 |
|
32 | 32 |
Goals: |
33 | 33 |
====== |
34 |
-* Modular (few interdependancies and the possibility of disabling individual parts during ./configure) |
|
34 |
+* Modular (few interdependencies and the possibility of disabling individual parts during ./configure) |
|
35 | 35 |
* Small (source and object) |
36 | 36 |
* Efficient (low CPU and memory usage) |
37 | 37 |
* Useful (avoid useless features almost noone needs) |
... | ... |
@@ -383,7 +383,7 @@ typedef struct RcOverride{ |
383 | 383 |
/* Unsupported options : |
384 | 384 |
* Syntax Arithmetic coding (SAC) |
385 | 385 |
* Reference Picture Selection |
386 |
- * Independant Segment Decoding */ |
|
386 |
+ * Independent Segment Decoding */ |
|
387 | 387 |
/* /Fx */ |
388 | 388 |
/* codec capabilities */ |
389 | 389 |
|
... | ... |
@@ -1705,14 +1705,14 @@ typedef struct AVCodecContext { |
1705 | 1705 |
|
1706 | 1706 |
/** |
1707 | 1707 |
* Thread count. |
1708 |
- * is used to decide how many independant tasks should be passed to execute() |
|
1708 |
+ * is used to decide how many independent tasks should be passed to execute() |
|
1709 | 1709 |
* - encoding: set by user |
1710 | 1710 |
* - decoding: set by user |
1711 | 1711 |
*/ |
1712 | 1712 |
int thread_count; |
1713 | 1713 |
|
1714 | 1714 |
/** |
1715 |
- * the codec may call this to execute several independant things. it will return only after |
|
1715 |
+ * the codec may call this to execute several independent things. it will return only after |
|
1716 | 1716 |
* finishing all tasks, the user may replace this with some multithreaded implementation, the |
1717 | 1717 |
* default implementation will execute the parts serially |
1718 | 1718 |
* @param count the number of things to execute |
... | ... |
@@ -2519,7 +2519,7 @@ void mpeg4_encode_picture_header(MpegEncContext * s, int picture_number) |
2519 | 2519 |
#endif //CONFIG_ENCODERS |
2520 | 2520 |
|
2521 | 2521 |
/** |
2522 |
- * set qscale and update qscale dependant variables. |
|
2522 |
+ * set qscale and update qscale dependent variables. |
|
2523 | 2523 |
*/ |
2524 | 2524 |
void ff_set_qscale(MpegEncContext * s, int qscale) |
2525 | 2525 |
{ |
... | ... |
@@ -901,7 +901,7 @@ typedef struct MJpegDecodeContext { |
901 | 901 |
int cur_scan; /* current scan, used by JPEG-LS */ |
902 | 902 |
} MJpegDecodeContext; |
903 | 903 |
|
904 |
-#include "jpeg_ls.c" //FIXME make jpeg-ls more independant |
|
904 |
+#include "jpeg_ls.c" //FIXME make jpeg-ls more independent |
|
905 | 905 |
|
906 | 906 |
static int mjpeg_decode_dht(MJpegDecodeContext *s); |
907 | 907 |
|
... | ... |
@@ -751,7 +751,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) |
751 | 751 |
//printf("%f ", q); |
752 | 752 |
assert(q>0.0); |
753 | 753 |
|
754 |
- if(pict_type==P_TYPE || s->intra_only){ //FIXME type dependant blur like in 2-pass |
|
754 |
+ if(pict_type==P_TYPE || s->intra_only){ //FIXME type dependent blur like in 2-pass |
|
755 | 755 |
rcc->short_term_qsum*=a->qblur; |
756 | 756 |
rcc->short_term_qcount*=a->qblur; |
757 | 757 |
|
... | ... |
@@ -811,7 +811,7 @@ static int init_pass2(MpegEncContext *s) |
811 | 811 |
int i, toobig; |
812 | 812 |
double fps= 1/av_q2d(s->avctx->time_base); |
813 | 813 |
double complexity[5]={0,0,0,0,0}; // aproximate bits at quant=1 |
814 |
- uint64_t const_bits[5]={0,0,0,0,0}; // quantizer idependant bits |
|
814 |
+ uint64_t const_bits[5]={0,0,0,0,0}; // quantizer independent bits |
|
815 | 815 |
uint64_t all_const_bits; |
816 | 816 |
uint64_t all_available_bits= (uint64_t)(s->bit_rate*(double)rcc->num_entries/fps); |
817 | 817 |
double rate_factor=0; |
... | ... |
@@ -422,7 +422,7 @@ typedef struct Plane{ |
422 | 422 |
}Plane; |
423 | 423 |
|
424 | 424 |
typedef struct SnowContext{ |
425 |
-// MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independant of MpegEncContext, so this will be removed then (FIXME/XXX) |
|
425 |
+// MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independent of MpegEncContext, so this will be removed then (FIXME/XXX) |
|
426 | 426 |
|
427 | 427 |
AVCodecContext *avctx; |
428 | 428 |
RangeCoder c; |
... | ... |
@@ -473,7 +473,7 @@ typedef struct SnowContext{ |
473 | 473 |
int me_cache_generation; |
474 | 474 |
slice_buffer sb; |
475 | 475 |
|
476 |
- MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independant of MpegEncContext, so this will be removed then (FIXME/XXX) |
|
476 |
+ MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independent of MpegEncContext, so this will be removed then (FIXME/XXX) |
|
477 | 477 |
}SnowContext; |
478 | 478 |
|
479 | 479 |
typedef struct { |
... | ... |
@@ -65,7 +65,7 @@ static VLC svq1_inter_mean; |
65 | 65 |
#define SVQ1_BLOCK_INTRA 3 |
66 | 66 |
|
67 | 67 |
typedef struct SVQ1Context { |
68 |
- MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independant of MpegEncContext, so this will be removed then (FIXME/XXX) |
|
68 |
+ MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independent of MpegEncContext, so this will be removed then (FIXME/XXX) |
|
69 | 69 |
AVCodecContext *avctx; |
70 | 70 |
DSPContext dsp; |
71 | 71 |
AVFrame picture; |