Originally committed as revision 12449 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun authored on 2008/03/16 01:15:47... | ... |
@@ -3202,7 +3202,7 @@ static int mpeg4_decode_video_packet_header(MpegEncContext *s) |
3202 | 3202 |
} |
3203 | 3203 |
if(s->pict_type == FF_B_TYPE){ |
3204 | 3204 |
while(s->next_picture.mbskip_table[ s->mb_index2xy[ mb_num ] ]) mb_num++; |
3205 |
- if(mb_num >= s->mb_num) return -1; // slice contains just skipped MBs which where allready decoded |
|
3205 |
+ if(mb_num >= s->mb_num) return -1; // slice contains just skipped MBs which where already decoded |
|
3206 | 3206 |
} |
3207 | 3207 |
|
3208 | 3208 |
s->mb_x= mb_num % s->mb_width; |
... | ... |
@@ -862,7 +862,7 @@ alloc: |
862 | 862 |
} |
863 | 863 |
|
864 | 864 |
if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL) |
865 |
- pic= (AVFrame*)s->current_picture_ptr; //we allready have a unused image (maybe it was set before reading the header) |
|
865 |
+ pic= (AVFrame*)s->current_picture_ptr; //we already have a unused image (maybe it was set before reading the header) |
|
866 | 866 |
else{ |
867 | 867 |
i= ff_find_unused_picture(s, 0); |
868 | 868 |
pic= (AVFrame*)&s->picture[i]; |
... | ... |
@@ -1375,7 +1375,7 @@ static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int th |
1375 | 1375 |
}else |
1376 | 1376 |
skip_dc=1; |
1377 | 1377 |
|
1378 |
- /* are all which we could set to zero are allready zero? */ |
|
1378 |
+ /* Are all we could set to zero already zero? */ |
|
1379 | 1379 |
if(last_index<=skip_dc - 1) return; |
1380 | 1380 |
|
1381 | 1381 |
for(i=0; i<=last_index; i++){ |
... | ... |
@@ -299,7 +299,7 @@ apply_masks(uint8_t *dst, int and, int or, int bits_per_pixel) |
299 | 299 |
/** |
300 | 300 |
* Paints a mouse pointer in an X11 image. |
301 | 301 |
* |
302 |
- * @param image Image where to paint the mouse pointer |
|
302 |
+ * @param image image to paint the mouse pointer to |
|
303 | 303 |
* @param s context used to retrieve original grabbing rectangle |
304 | 304 |
* coordinates |
305 | 305 |
* @param x Mouse pointer coordinate |
... | ... |
@@ -111,7 +111,7 @@ static uint64_t find_any_startcode(ByteIOContext *bc, int64_t pos){ |
111 | 111 |
uint64_t state=0; |
112 | 112 |
|
113 | 113 |
if(pos >= 0) |
114 |
- url_fseek(bc, pos, SEEK_SET); //note, this may fail if the stream is not seekable, but that should not matter, as in this case we simply start where we are currently |
|
114 |
+ url_fseek(bc, pos, SEEK_SET); //note, this may fail if the stream is not seekable, but that should not matter, as in this case we simply start where we currently are |
|
115 | 115 |
|
116 | 116 |
while(!url_feof(bc)){ |
117 | 117 |
state= (state<<8) | get_byte(bc); |
... | ... |
@@ -318,7 +318,7 @@ static int rtp_parse_mp4_au(RTPDemuxContext *s, const uint8_t *buf) |
318 | 318 |
if (infos == NULL) |
319 | 319 |
return -1; |
320 | 320 |
|
321 |
- /* decode the first 2 bytes where are stored the AUHeader sections |
|
321 |
+ /* decode the first 2 bytes where the AUHeader sections are stored |
|
322 | 322 |
length in bits */ |
323 | 323 |
au_headers_length = AV_RB16(buf); |
324 | 324 |
|
... | ... |
@@ -1990,7 +1990,7 @@ int av_find_stream_info(AVFormatContext *ic) |
1990 | 1990 |
count++; |
1991 | 1991 |
} |
1992 | 1992 |
|
1993 |
- // close codecs which where opened in try_decode_frame() |
|
1993 |
+ // close codecs which were opened in try_decode_frame() |
|
1994 | 1994 |
for(i=0;i<ic->nb_streams;i++) { |
1995 | 1995 |
st = ic->streams[i]; |
1996 | 1996 |
if(st->codec->codec) |
... | ... |
@@ -392,7 +392,7 @@ static inline void doHorizLowPass_C(uint8_t dst[], int stride, PPContext *c) |
392 | 392 |
/** |
393 | 393 |
* Experimental Filter 1 (Horizontal) |
394 | 394 |
* will not damage linear gradients |
395 |
- * Flat blocks should look like they where passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter |
|
395 |
+ * Flat blocks should look like they were passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter |
|
396 | 396 |
* can only smooth blocks at the expected locations (it cannot smooth them if they did move) |
397 | 397 |
* MMX2 version does correct clipping C version does not |
398 | 398 |
* not identical with the vertical one |
... | ... |
@@ -478,7 +478,7 @@ static inline void RENAME(vertRK1Filter)(uint8_t *src, int stride, int QP) |
478 | 478 |
/** |
479 | 479 |
* Experimental Filter 1 |
480 | 480 |
* will not damage linear gradients |
481 |
- * Flat blocks should look like they where passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter |
|
481 |
+ * Flat blocks should look like they were passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter |
|
482 | 482 |
* can only smooth blocks at the expected locations (it cannot smooth them if they did move) |
483 | 483 |
* MMX2 version does correct clipping C version does not |
484 | 484 |
*/ |
... | ... |
@@ -1546,7 +1546,7 @@ DERING_CORE((%0, %1, 8) ,(%%REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,%%mm1, |
1546 | 1546 |
/** |
1547 | 1547 |
* Deinterlaces the given block by linearly interpolating every second line. |
1548 | 1548 |
* will be called for every 8x8 block and can read & write from line 4-15 |
1549 |
- * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too |
|
1549 |
+ * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. |
|
1550 | 1550 |
* lines 4-12 will be read into the deblocking filter and should be deinterlaced |
1551 | 1551 |
*/ |
1552 | 1552 |
static inline void RENAME(deInterlaceInterpolateLinear)(uint8_t src[], int stride) |
... | ... |
@@ -1598,7 +1598,7 @@ static inline void RENAME(deInterlaceInterpolateLinear)(uint8_t src[], int strid |
1598 | 1598 |
/** |
1599 | 1599 |
* Deinterlaces the given block by cubic interpolating every second line. |
1600 | 1600 |
* will be called for every 8x8 block and can read & write from line 4-15 |
1601 |
- * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too |
|
1601 |
+ * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. |
|
1602 | 1602 |
* lines 4-12 will be read into the deblocking filter and should be deinterlaced |
1603 | 1603 |
* this filter will read lines 3-15 and write 7-13 |
1604 | 1604 |
*/ |
... | ... |
@@ -1663,7 +1663,7 @@ DEINT_CUBIC((%%REGd, %1), (%0, %1, 8) , (%%REGd, %1, 4), (%%REGc) , (%%REGc, |
1663 | 1663 |
/** |
1664 | 1664 |
* Deinterlaces the given block by filtering every second line with a (-1 4 2 4 -1) filter. |
1665 | 1665 |
* will be called for every 8x8 block and can read & write from line 4-15 |
1666 |
- * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too |
|
1666 |
+ * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. |
|
1667 | 1667 |
* lines 4-12 will be read into the deblocking filter and should be deinterlaced |
1668 | 1668 |
* this filter will read lines 4-13 and write 5-11 |
1669 | 1669 |
*/ |
... | ... |
@@ -1743,7 +1743,7 @@ DEINT_FF((%%REGd, %1), (%%REGd, %1, 2), (%0, %1, 8) , (%%REGd, %1, 4)) |
1743 | 1743 |
/** |
1744 | 1744 |
* Deinterlaces the given block by filtering every line with a (-1 2 6 2 -1) filter. |
1745 | 1745 |
* will be called for every 8x8 block and can read & write from line 4-15 |
1746 |
- * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too |
|
1746 |
+ * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. |
|
1747 | 1747 |
* lines 4-12 will be read into the deblocking filter and should be deinterlaced |
1748 | 1748 |
* this filter will read lines 4-13 and write 4-11 |
1749 | 1749 |
*/ |
... | ... |
@@ -1845,7 +1845,7 @@ DEINT_L5(%%mm1, %%mm0, (%%REGd, %1, 2), (%0, %1, 8) , (%%REGd, %1, 4)) |
1845 | 1845 |
/** |
1846 | 1846 |
* Deinterlaces the given block by filtering all lines with a (1 2 1) filter. |
1847 | 1847 |
* will be called for every 8x8 block and can read & write from line 4-15 |
1848 |
- * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too |
|
1848 |
+ * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. |
|
1849 | 1849 |
* lines 4-12 will be read into the deblocking filter and should be deinterlaced |
1850 | 1850 |
* this filter will read lines 4-13 and write 4-11 |
1851 | 1851 |
*/ |
... | ... |
@@ -1947,7 +1947,7 @@ static inline void RENAME(deInterlaceBlendLinear)(uint8_t src[], int stride, uin |
1947 | 1947 |
/** |
1948 | 1948 |
* Deinterlaces the given block by applying a median filter to every second line. |
1949 | 1949 |
* will be called for every 8x8 block and can read & write from line 4-15, |
1950 |
- * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too |
|
1950 |
+ * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. |
|
1951 | 1951 |
* lines 4-12 will be read into the deblocking filter and should be deinterlaced |
1952 | 1952 |
*/ |
1953 | 1953 |
static inline void RENAME(deInterlaceMedian)(uint8_t src[], int stride) |