typo fixes
Originally committed as revision 12449 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
bee972eead
commit
bd10713636
@ -3202,7 +3202,7 @@ static int mpeg4_decode_video_packet_header(MpegEncContext *s)
|
|||||||
}
|
}
|
||||||
if(s->pict_type == FF_B_TYPE){
|
if(s->pict_type == FF_B_TYPE){
|
||||||
while(s->next_picture.mbskip_table[ s->mb_index2xy[ mb_num ] ]) mb_num++;
|
while(s->next_picture.mbskip_table[ s->mb_index2xy[ mb_num ] ]) mb_num++;
|
||||||
if(mb_num >= s->mb_num) return -1; // slice contains just skipped MBs which where allready decoded
|
if(mb_num >= s->mb_num) return -1; // slice contains just skipped MBs which where already decoded
|
||||||
}
|
}
|
||||||
|
|
||||||
s->mb_x= mb_num % s->mb_width;
|
s->mb_x= mb_num % s->mb_width;
|
||||||
|
@ -862,7 +862,7 @@ alloc:
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL)
|
if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL)
|
||||||
pic= (AVFrame*)s->current_picture_ptr; //we allready have a unused image (maybe it was set before reading the header)
|
pic= (AVFrame*)s->current_picture_ptr; //we already have a unused image (maybe it was set before reading the header)
|
||||||
else{
|
else{
|
||||||
i= ff_find_unused_picture(s, 0);
|
i= ff_find_unused_picture(s, 0);
|
||||||
pic= (AVFrame*)&s->picture[i];
|
pic= (AVFrame*)&s->picture[i];
|
||||||
|
@ -1375,7 +1375,7 @@ static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int th
|
|||||||
}else
|
}else
|
||||||
skip_dc=1;
|
skip_dc=1;
|
||||||
|
|
||||||
/* are all which we could set to zero are allready zero? */
|
/* Are all we could set to zero already zero? */
|
||||||
if(last_index<=skip_dc - 1) return;
|
if(last_index<=skip_dc - 1) return;
|
||||||
|
|
||||||
for(i=0; i<=last_index; i++){
|
for(i=0; i<=last_index; i++){
|
||||||
|
@ -299,7 +299,7 @@ apply_masks(uint8_t *dst, int and, int or, int bits_per_pixel)
|
|||||||
/**
|
/**
|
||||||
* Paints a mouse pointer in an X11 image.
|
* Paints a mouse pointer in an X11 image.
|
||||||
*
|
*
|
||||||
* @param image Image where to paint the mouse pointer
|
* @param image image to paint the mouse pointer to
|
||||||
* @param s context used to retrieve original grabbing rectangle
|
* @param s context used to retrieve original grabbing rectangle
|
||||||
* coordinates
|
* coordinates
|
||||||
* @param x Mouse pointer coordinate
|
* @param x Mouse pointer coordinate
|
||||||
|
@ -111,7 +111,7 @@ static uint64_t find_any_startcode(ByteIOContext *bc, int64_t pos){
|
|||||||
uint64_t state=0;
|
uint64_t state=0;
|
||||||
|
|
||||||
if(pos >= 0)
|
if(pos >= 0)
|
||||||
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
|
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
|
||||||
|
|
||||||
while(!url_feof(bc)){
|
while(!url_feof(bc)){
|
||||||
state= (state<<8) | get_byte(bc);
|
state= (state<<8) | get_byte(bc);
|
||||||
|
@ -318,7 +318,7 @@ static int rtp_parse_mp4_au(RTPDemuxContext *s, const uint8_t *buf)
|
|||||||
if (infos == NULL)
|
if (infos == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* decode the first 2 bytes where are stored the AUHeader sections
|
/* decode the first 2 bytes where the AUHeader sections are stored
|
||||||
length in bits */
|
length in bits */
|
||||||
au_headers_length = AV_RB16(buf);
|
au_headers_length = AV_RB16(buf);
|
||||||
|
|
||||||
|
@ -1990,7 +1990,7 @@ int av_find_stream_info(AVFormatContext *ic)
|
|||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// close codecs which where opened in try_decode_frame()
|
// close codecs which were opened in try_decode_frame()
|
||||||
for(i=0;i<ic->nb_streams;i++) {
|
for(i=0;i<ic->nb_streams;i++) {
|
||||||
st = ic->streams[i];
|
st = ic->streams[i];
|
||||||
if(st->codec->codec)
|
if(st->codec->codec)
|
||||||
|
@ -392,7 +392,7 @@ static inline void doHorizLowPass_C(uint8_t dst[], int stride, PPContext *c)
|
|||||||
/**
|
/**
|
||||||
* Experimental Filter 1 (Horizontal)
|
* Experimental Filter 1 (Horizontal)
|
||||||
* will not damage linear gradients
|
* will not damage linear gradients
|
||||||
* Flat blocks should look like they where passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter
|
* Flat blocks should look like they were passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter
|
||||||
* can only smooth blocks at the expected locations (it cannot smooth them if they did move)
|
* can only smooth blocks at the expected locations (it cannot smooth them if they did move)
|
||||||
* MMX2 version does correct clipping C version does not
|
* MMX2 version does correct clipping C version does not
|
||||||
* not identical with the vertical one
|
* not identical with the vertical one
|
||||||
|
@ -478,7 +478,7 @@ static inline void RENAME(vertRK1Filter)(uint8_t *src, int stride, int QP)
|
|||||||
/**
|
/**
|
||||||
* Experimental Filter 1
|
* Experimental Filter 1
|
||||||
* will not damage linear gradients
|
* will not damage linear gradients
|
||||||
* Flat blocks should look like they where passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter
|
* Flat blocks should look like they were passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter
|
||||||
* can only smooth blocks at the expected locations (it cannot smooth them if they did move)
|
* can only smooth blocks at the expected locations (it cannot smooth them if they did move)
|
||||||
* MMX2 version does correct clipping C version does not
|
* MMX2 version does correct clipping C version does not
|
||||||
*/
|
*/
|
||||||
@ -1546,7 +1546,7 @@ DERING_CORE((%0, %1, 8) ,(%%REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,%%mm1,
|
|||||||
/**
|
/**
|
||||||
* Deinterlaces the given block by linearly interpolating every second line.
|
* Deinterlaces the given block by linearly interpolating every second line.
|
||||||
* will be called for every 8x8 block and can read & write from line 4-15
|
* will be called for every 8x8 block and can read & write from line 4-15
|
||||||
* lines 0-3 have been passed through the deblock / dering filters allready, but can be read too
|
* lines 0-3 have been passed through the deblock / dering filters already, but can be read, too.
|
||||||
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
||||||
*/
|
*/
|
||||||
static inline void RENAME(deInterlaceInterpolateLinear)(uint8_t src[], int stride)
|
static inline void RENAME(deInterlaceInterpolateLinear)(uint8_t src[], int stride)
|
||||||
@ -1598,7 +1598,7 @@ static inline void RENAME(deInterlaceInterpolateLinear)(uint8_t src[], int strid
|
|||||||
/**
|
/**
|
||||||
* Deinterlaces the given block by cubic interpolating every second line.
|
* Deinterlaces the given block by cubic interpolating every second line.
|
||||||
* will be called for every 8x8 block and can read & write from line 4-15
|
* will be called for every 8x8 block and can read & write from line 4-15
|
||||||
* lines 0-3 have been passed through the deblock / dering filters allready, but can be read too
|
* lines 0-3 have been passed through the deblock / dering filters already, but can be read, too.
|
||||||
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
||||||
* this filter will read lines 3-15 and write 7-13
|
* this filter will read lines 3-15 and write 7-13
|
||||||
*/
|
*/
|
||||||
@ -1663,7 +1663,7 @@ DEINT_CUBIC((%%REGd, %1), (%0, %1, 8) , (%%REGd, %1, 4), (%%REGc) , (%%REGc,
|
|||||||
/**
|
/**
|
||||||
* Deinterlaces the given block by filtering every second line with a (-1 4 2 4 -1) filter.
|
* Deinterlaces the given block by filtering every second line with a (-1 4 2 4 -1) filter.
|
||||||
* will be called for every 8x8 block and can read & write from line 4-15
|
* will be called for every 8x8 block and can read & write from line 4-15
|
||||||
* lines 0-3 have been passed through the deblock / dering filters allready, but can be read too
|
* lines 0-3 have been passed through the deblock / dering filters already, but can be read, too.
|
||||||
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
||||||
* this filter will read lines 4-13 and write 5-11
|
* this filter will read lines 4-13 and write 5-11
|
||||||
*/
|
*/
|
||||||
@ -1743,7 +1743,7 @@ DEINT_FF((%%REGd, %1), (%%REGd, %1, 2), (%0, %1, 8) , (%%REGd, %1, 4))
|
|||||||
/**
|
/**
|
||||||
* Deinterlaces the given block by filtering every line with a (-1 2 6 2 -1) filter.
|
* Deinterlaces the given block by filtering every line with a (-1 2 6 2 -1) filter.
|
||||||
* will be called for every 8x8 block and can read & write from line 4-15
|
* will be called for every 8x8 block and can read & write from line 4-15
|
||||||
* lines 0-3 have been passed through the deblock / dering filters allready, but can be read too
|
* lines 0-3 have been passed through the deblock / dering filters already, but can be read, too.
|
||||||
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
||||||
* this filter will read lines 4-13 and write 4-11
|
* this filter will read lines 4-13 and write 4-11
|
||||||
*/
|
*/
|
||||||
@ -1845,7 +1845,7 @@ DEINT_L5(%%mm1, %%mm0, (%%REGd, %1, 2), (%0, %1, 8) , (%%REGd, %1, 4))
|
|||||||
/**
|
/**
|
||||||
* Deinterlaces the given block by filtering all lines with a (1 2 1) filter.
|
* Deinterlaces the given block by filtering all lines with a (1 2 1) filter.
|
||||||
* will be called for every 8x8 block and can read & write from line 4-15
|
* will be called for every 8x8 block and can read & write from line 4-15
|
||||||
* lines 0-3 have been passed through the deblock / dering filters allready, but can be read too
|
* lines 0-3 have been passed through the deblock / dering filters already, but can be read, too.
|
||||||
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
||||||
* this filter will read lines 4-13 and write 4-11
|
* this filter will read lines 4-13 and write 4-11
|
||||||
*/
|
*/
|
||||||
@ -1947,7 +1947,7 @@ static inline void RENAME(deInterlaceBlendLinear)(uint8_t src[], int stride, uin
|
|||||||
/**
|
/**
|
||||||
* Deinterlaces the given block by applying a median filter to every second line.
|
* Deinterlaces the given block by applying a median filter to every second line.
|
||||||
* will be called for every 8x8 block and can read & write from line 4-15,
|
* will be called for every 8x8 block and can read & write from line 4-15,
|
||||||
* lines 0-3 have been passed through the deblock / dering filters allready, but can be read too
|
* lines 0-3 have been passed through the deblock / dering filters already, but can be read, too.
|
||||||
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
* lines 4-12 will be read into the deblocking filter and should be deinterlaced
|
||||||
*/
|
*/
|
||||||
static inline void RENAME(deInterlaceMedian)(uint8_t src[], int stride)
|
static inline void RENAME(deInterlaceMedian)(uint8_t src[], int stride)
|
||||||
|
Loading…
Reference in New Issue
Block a user