mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-22 15:23:11 +00:00
typos
Originally committed as revision 8642 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e42dba481f
commit
fe0372296a
@ -80,7 +80,7 @@ Generic Parts:
|
||||
eval.c Michael Niedermayer
|
||||
audio and video frame extraction:
|
||||
parser.c
|
||||
bitsream reading:
|
||||
bitstream reading:
|
||||
bitstream.c, bitstream.h Michael Niedermayer
|
||||
CABAC:
|
||||
cabac.h, cabac.c Michael Niedermayer
|
||||
|
@ -175,7 +175,7 @@ static const uint64_t ff_pb_FC attribute_used __attribute__ ((aligned(8))) = 0xF
|
||||
/* 3Dnow specific */
|
||||
|
||||
#define DEF(x) x ## _3dnow
|
||||
/* for Athlons PAVGUSB is prefered */
|
||||
/* for Athlons PAVGUSB is preferred */
|
||||
#define PAVGB "pavgusb"
|
||||
|
||||
#include "dsputil_mmx_avg.h"
|
||||
|
@ -2289,7 +2289,7 @@ static int mp_decode_layer3(MPADecodeContext *s)
|
||||
for(ch=0;ch<s->nb_channels;ch++) {
|
||||
g = &granules[ch][gr];
|
||||
if(get_bits_count(&s->gb)<0){
|
||||
av_log(NULL, AV_LOG_ERROR, "mdb:%d, lastbuf:%d skiping granule %d\n",
|
||||
av_log(NULL, AV_LOG_ERROR, "mdb:%d, lastbuf:%d skipping granule %d\n",
|
||||
main_data_begin, s->last_buf_size, gr);
|
||||
skip_bits_long(&s->gb, g->part2_3_length);
|
||||
memset(g->sb_hybrid, 0, sizeof(g->sb_hybrid));
|
||||
|
@ -511,7 +511,7 @@ static const AVOption options[]={
|
||||
{"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|E, "strict"},
|
||||
{"normal", NULL, 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_NORMAL, INT_MIN, INT_MAX, V|E, "strict"},
|
||||
{"inofficial", "allow inofficial extensions", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_INOFFICIAL, INT_MIN, INT_MAX, V|E, "strict"},
|
||||
{"experimental", "allow non standarized experimental things", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_EXPERIMENTAL, INT_MIN, INT_MAX, V|E, "strict"},
|
||||
{"experimental", "allow non standardized experimental things", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_EXPERIMENTAL, INT_MIN, INT_MAX, V|E, "strict"},
|
||||
{"b_qoffset", "qp offset between p and b frames", OFFSET(b_quant_offset), FF_OPT_TYPE_FLOAT, 1.25, FLT_MIN, FLT_MAX, V|E},
|
||||
{"er", "set error resilience strategy", OFFSET(error_resilience), FF_OPT_TYPE_INT, FF_ER_CAREFUL, INT_MIN, INT_MAX, A|V|D, "er"},
|
||||
{"careful", NULL, 0, FF_OPT_TYPE_CONST, FF_ER_CAREFUL, INT_MIN, INT_MAX, V|D, "er"},
|
||||
@ -698,7 +698,7 @@ static const AVOption options[]={
|
||||
{"fastpskip", "fast pskip (H.264)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_FASTPSKIP, INT_MIN, INT_MAX, V|E, "flags2"},
|
||||
{"aud", "access unit delimiters (H.264)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_AUD, INT_MIN, INT_MAX, V|E, "flags2"},
|
||||
{"brdo", "b-frame rate-distortion optimization", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_BRDO, INT_MIN, INT_MAX, V|E, "flags2"},
|
||||
{"skiprd", "RD optimal MB level residual skiping", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_SKIP_RD, INT_MIN, INT_MAX, V|E, "flags2"},
|
||||
{"skiprd", "RD optimal MB level residual skipping", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_SKIP_RD, INT_MIN, INT_MAX, V|E, "flags2"},
|
||||
{"complexityblur", "reduce fluctuations in qp (before curve compression)", OFFSET(complexityblur), FF_OPT_TYPE_FLOAT, 20.0, FLT_MIN, FLT_MAX, V|E},
|
||||
{"deblockalpha", "in-loop deblocking filter alphac0 parameter", OFFSET(deblockalpha), FF_OPT_TYPE_INT, DEFAULT, -6, 6, V|E},
|
||||
{"deblockbeta", "in-loop deblocking filter beta parameter", OFFSET(deblockbeta), FF_OPT_TYPE_INT, DEFAULT, -6, 6, V|E},
|
||||
|
@ -85,7 +85,7 @@ static int xan_decode_init(AVCodecContext *avctx)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* This function is used in lieu of memcpy(). This decoder can not use
|
||||
/* This function is used in lieu of memcpy(). This decoder cannot use
|
||||
* memcpy because the memory locations often overlap and
|
||||
* memcpy doesn't like that; it's not uncommon, for example, for
|
||||
* dest = src+1, to turn byte A into pattern AAAAAAAA.
|
||||
|
Loading…
Reference in New Issue
Block a user