Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
external
ffmpeg
Commits
da9cea77
Commit
da9cea77
authored
Oct 05, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a bunch of common typos.
parent
2e87b4c5
Changes
51
Hide whitespace changes
Inline
Side-by-side
Showing
51 changed files
with
83 additions
and
82 deletions
+83
-82
avconv.c
avconv.c
+1
-1
avserver.c
avserver.c
+1
-1
cmdutils.h
cmdutils.h
+3
-3
doc/avconv.texi
doc/avconv.texi
+1
-1
doc/avserver.texi
doc/avserver.texi
+1
-1
doc/avtools-common-opts.texi
doc/avtools-common-opts.texi
+1
-1
doc/developer.texi
doc/developer.texi
+2
-2
doc/eval.texi
doc/eval.texi
+2
-2
doc/filters.texi
doc/filters.texi
+9
-9
doc/general.texi
doc/general.texi
+1
-1
doc/protocols.texi
doc/protocols.texi
+3
-3
doc/soc.txt
doc/soc.txt
+1
-1
ffmpeg.c
ffmpeg.c
+1
-1
libavcodec/avcodec.h
libavcodec/avcodec.h
+2
-2
libavcodec/bitstream.c
libavcodec/bitstream.c
+1
-1
libavcodec/dsputil.h
libavcodec/dsputil.h
+2
-2
libavcodec/eatgv.c
libavcodec/eatgv.c
+2
-2
libavcodec/error_resilience.c
libavcodec/error_resilience.c
+1
-1
libavcodec/g722enc.c
libavcodec/g722enc.c
+1
-1
libavcodec/h264.c
libavcodec/h264.c
+3
-3
libavcodec/jfdctint_template.c
libavcodec/jfdctint_template.c
+1
-1
libavcodec/lpc.h
libavcodec/lpc.h
+1
-1
libavcodec/mjpegdec.c
libavcodec/mjpegdec.c
+3
-3
libavcodec/mpegvideo.h
libavcodec/mpegvideo.h
+1
-1
libavcodec/proresdec.c
libavcodec/proresdec.c
+1
-1
libavcodec/tscc.c
libavcodec/tscc.c
+1
-1
libavcodec/vaapi_mpeg4.c
libavcodec/vaapi_mpeg4.c
+1
-1
libavcodec/vc1dec.c
libavcodec/vc1dec.c
+3
-3
libavcodec/wmaprodec.c
libavcodec/wmaprodec.c
+1
-1
libavcodec/wmavoice.c
libavcodec/wmavoice.c
+2
-2
libavcodec/x86/vc1dsp_yasm.asm
libavcodec/x86/vc1dsp_yasm.asm
+1
-1
libavdevice/jack_audio.c
libavdevice/jack_audio.c
+1
-1
libavdevice/timefilter.h
libavdevice/timefilter.h
+1
-1
libavformat/avformat.h
libavformat/avformat.h
+4
-3
libavformat/flvenc.c
libavformat/flvenc.c
+2
-2
libavformat/id3v2.c
libavformat/id3v2.c
+1
-1
libavformat/img2.c
libavformat/img2.c
+1
-1
libavformat/iv8.c
libavformat/iv8.c
+1
-1
libavformat/mms.h
libavformat/mms.h
+1
-1
libavformat/movenc.c
libavformat/movenc.c
+1
-1
libavformat/mpegts.c
libavformat/mpegts.c
+4
-4
libavformat/mpegtsenc.c
libavformat/mpegtsenc.c
+1
-1
libavformat/mxfenc.c
libavformat/mxfenc.c
+1
-1
libavformat/rdt.c
libavformat/rdt.c
+1
-1
libavformat/rtp.h
libavformat/rtp.h
+1
-1
libavformat/udp.c
libavformat/udp.c
+1
-1
libavformat/utils.c
libavformat/utils.c
+2
-2
libavutil/eval.h
libavutil/eval.h
+1
-1
libpostproc/postprocess.c
libpostproc/postprocess.c
+1
-1
libpostproc/postprocess_internal.h
libpostproc/postprocess_internal.h
+1
-1
tools/patcheck
tools/patcheck
+1
-1
No files found.
avconv.c
View file @
da9cea77
...
...
@@ -3682,7 +3682,7 @@ static void opt_output_file(void *optctx, const char *filename)
}
if
(
!
(
oc
->
oformat
->
flags
&
AVFMT_NOFILE
))
{
/* test if it already exists to avoid lo
o
sing precious files */
/* test if it already exists to avoid losing precious files */
assert_file_overwrite
(
filename
);
/* open the file */
...
...
avserver.c
View file @
da9cea77
...
...
@@ -475,7 +475,7 @@ static void start_children(FFStream *feed)
slash
++
;
strcpy
(
slash
,
"avconv"
);
http_log
(
"Launch commandline: "
);
http_log
(
"Launch command
line: "
);
http_log
(
"%s "
,
pathname
);
for
(
i
=
1
;
feed
->
child_argv
[
i
]
&&
feed
->
child_argv
[
i
][
0
];
i
++
)
http_log
(
"%s "
,
feed
->
child_argv
[
i
]);
...
...
cmdutils.h
View file @
da9cea77
...
...
@@ -83,7 +83,7 @@ int opt_timelimit(const char *opt, const char *arg);
* parsed or the corresponding value is invalid.
*
* @param context the context of the value to be set (e.g. the
* corresponding commandline option name)
* corresponding command
line option name)
* @param numstr the string to be parsed
* @param type the type (OPT_INT64 or OPT_FLOAT) as which the
* string should be parsed
...
...
@@ -98,7 +98,7 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do
* the string cannot be correctly parsed.
*
* @param context the context of the value to be set (e.g. the
* corresponding commandline option name)
* corresponding command
line option name)
* @param timestr the string to be parsed
* @param is_duration a flag which tells how to interpret timestr, if
* not zero timestr is interpreted as a duration, otherwise as a
...
...
@@ -181,7 +181,7 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options
int
parse_option
(
void
*
optctx
,
const
char
*
opt
,
const
char
*
arg
,
const
OptionDef
*
options
);
/**
* Find the '-loglevel' option in the commandline args and apply it.
* Find the '-loglevel' option in the command
line args and apply it.
*/
void
parse_loglevel
(
int
argc
,
char
**
argv
,
const
OptionDef
*
options
);
...
...
doc/avconv.texi
View file @
da9cea77
...
...
@@ -29,7 +29,7 @@ rates and resize video on the fly with a high quality polyphase filter.
avconv reads from an arbitrary number of input "files" (which can be regular
files, pipes, network streams, grabbing devices, etc.), specified by the
@code
{
-i
}
option, and writes to an arbitrary number of output "files", which are
specified by a plain output filename. Anything found on the commandline which
specified by a plain output filename. Anything found on the command
line which
cannot be interpreted as an option is considered to be an output filename.
Each input or output file can in principle contain any number of streams of
...
...
doc/avserver.texi
View file @
da9cea77
...
...
@@ -150,7 +150,7 @@ that only captures in stereo and also requires that one channel be flipped.
If you are one of these people, then export 'AUDIO
_
FLIP
_
LEFT=1' before
starting avconv.
@subsection The audio and video lo
o
se sync after a while.
@subsection The audio and video lose sync after a while.
Yes, they do.
...
...
doc/avtools-common-opts.texi
View file @
da9cea77
...
...
@@ -9,7 +9,7 @@ example 'KB', 'MiB', 'G' and 'B' as postfix.
Options which do not take arguments are boolean options, and set the
corresponding value to true. They can be set to false by prefixing
with "no" the option name, for example using "-nofoo" in the
commandline will set to false the boolean option with name "foo".
command
line will set to false the boolean option with name "foo".
@section Stream specifiers
Some options are applied per-stream, e.g. bitrate or codec. Stream specifiers
...
...
doc/developer.texi
View file @
da9cea77
...
...
@@ -49,7 +49,7 @@ mailing list.
The code is written in K
&
R C style. That means the following:
@itemize @bullet
@item
The control statements are formatted by putting space betwen the statement
The control statements are formatted by putting space betwe
e
n the statement
and parenthesis in the following way:
@example
for (i = 0; i < filter->input
_
count; i++) @
{
...
...
@@ -79,7 +79,7 @@ if (!pic || !picref)
goto fail;
@end example
@item
Do not put spaces immediately inside parenthes
i
s. @samp
{
if (ret)
}
is
Do not put spaces immediately inside parenthes
e
s. @samp
{
if (ret)
}
is
a valid style; @samp
{
if ( ret )
}
is not.
@end itemize
...
...
doc/eval.texi
View file @
da9cea77
@chapter Expression Evaluation
@c man begin EXPRESSION EVALUATION
When evaluating an arith
e
metic expression, Libav uses an internal
When evaluating an arithmetic expression, Libav uses an internal
formula evaluator, implemented through the @file{libavutil/eval.h}
interface.
...
...
@@ -53,7 +53,7 @@ returns the value stored in the internal variable.
@item ld(var)
Allow to load the value of the internal variable with number
@var{var}, which was previosly stored with st(@var{var}, @var{expr}).
@var{var}, which was previo
u
sly stored with st(@var{var}, @var{expr}).
The function returns the loaded value.
@item while(cond, expr)
...
...
doc/filters.texi
View file @
da9cea77
...
...
@@ -200,7 +200,7 @@ input plane. They are expressions, and can contain the following
constants:
@table @option
@item w, h
the input width and heig
t
h in pixels
the input width and heigh
t
in pixels
@item cw, ch
the input chroma image width and height in pixels
...
...
@@ -888,7 +888,7 @@ the corresponding mathematical approximated values for e
(euler number), pi (greek PI), PHI (golden ratio)
@item w, h
the input width and heig
t
h
the input width and heigh
t
@item val
input value for the pixel component
...
...
@@ -992,7 +992,7 @@ The filter takes the parameters: @var{filter_name}@{:=@}@var{filter_params}.
filter. If not specified the default values are assumed.
Refer to the official libopencv documentation for more precise
information
s
:
information:
@url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}
Follows the list of supported libopencv filters.
...
...
@@ -1008,7 +1008,7 @@ It accepts the parameters: @var{struct_el}:@var{nb_iterations}.
@var{struct_el} represents a structuring element, and has the syntax:
@var{cols}x@var{rows}+@var{anchor_x}x@var{anchor_y}/@var{shape}
@var{cols} and @var{rows} represent the number of colums and rows of
@var{cols} and @var{rows} represent the number of colum
n
s and rows of
the structuring element, @var{anchor_x} and @var{anchor_y} the anchor
point, and @var{shape} the shape for the structuring element, and
can be one of the values "rect", "cross", "ellipse", "custom".
...
...
@@ -1184,7 +1184,7 @@ value for @var{width} or @var{height} is 0, the corresponding input size
is used for the output.
The @var{width} expression can reference the value set by the
@var{height} expression, and viceversa.
@var{height} expression, and vice
versa.
The default value of @var{width} and @var{height} is 0.
...
...
@@ -1194,7 +1194,7 @@ Specify the offsets where to place the input image in the padded area
with respect to the top/left border of the output image.
The @var{x} expression can reference the value set by the @var{y}
expression, and viceversa.
expression, and vice
versa.
The default value of @var{x} and @var{y} is 0.
...
...
@@ -1608,7 +1608,7 @@ seconds
@item pos
position of the frame in the input stream, -1 if this information in
unavailable and/or meanigless (for example in case of synthetic video)
unavailable and/or meani
n
gless (for example in case of synthetic video)
@item fmt
pixel format name
...
...
@@ -1825,7 +1825,7 @@ through the interface defined in @file{libavfilter/vsrc_buffer.h}.
It accepts the following parameters:
@var{width}:@var{height}:@var{pix_fmt_string}:@var{timebase_num}:@var{timebase_den}:@var{sample_aspect_ratio_num}:@var{sample_aspect_ratio.den}
All the parameters need to be explicit
e
ly defined.
All the parameters need to be explicitly defined.
Follows the list of the accepted parameters.
...
...
@@ -2017,7 +2017,7 @@ separated by ":". The description of the accepted options follows.
@item size, s
Specify the size of the sourced video, it may be a string of the form
@var{width}x@var{heig
t
h}, or the name of a size abbreviation. The
@var{width}x@var{heigh
t
}, or the name of a size abbreviation. The
default value is "320x240".
@item rate, r
...
...
doc/general.texi
View file @
da9cea77
...
...
@@ -485,7 +485,7 @@ following image formats are supported:
@item id RoQ video @tab X @tab X
@tab Used in Quake III, Jedi Knight 2, other computer games.
@item IFF ILBM @tab @tab X
@tab IFF interlaved bitmap
@tab IFF interl
e
aved bitmap
@item IFF ByteRun1 @tab @tab X
@tab IFF run length encoded bitmap
@item Intel H.263 @tab @tab X
...
...
doc/protocols.texi
View file @
da9cea77
...
...
@@ -155,8 +155,8 @@ be seekable, so they will fail with the pipe output protocol.
Real-Time Messaging Protocol.
The Real-Time Messaging Protocol (RTMP) is used for streaming multime
‐
dia
content across a TCP/IP network.
The Real-Time Messaging Protocol (RTMP) is used for streaming multime
dia
content across a TCP/IP network.
The required syntax is:
@example
...
...
@@ -195,7 +195,7 @@ Real-Time Messaging Protocol and its variants supported through
librtmp.
Requires the presence of the librtmp headers and library during
configuration. You need to explicit
e
ly configure the build with
configuration. You need to explicitly configure the build with
"--enable-librtmp". If enabled this will replace the native RTMP
protocol.
...
...
doc/soc.txt
View file @
da9cea77
...
...
@@ -18,7 +18,7 @@ essential that changes to their codebase are publicly visible, clean and
easy reviewable that again leads us to:
* use of a revision control system like git
* separation of cosmetic from non-cosmetic changes (this is almost entirely
ignored by mentors and students in soc 2006 which might lead to a suprise
ignored by mentors and students in soc 2006 which might lead to a su
r
prise
when the code will be reviewed at the end before a possible inclusion in
Libav, individual changes were generally not reviewable due to cosmetics).
* frequent commits, so that comments can be provided early
ffmpeg.c
View file @
da9cea77
...
...
@@ -3797,7 +3797,7 @@ static void opt_output_file(void *optctx, const char *filename)
}
if
(
!
(
oc
->
oformat
->
flags
&
AVFMT_NOFILE
))
{
/* test if it already exists to avoid lo
o
sing precious files */
/* test if it already exists to avoid losing precious files */
if
(
!
file_overwrite
&&
(
strchr
(
filename
,
':'
)
==
NULL
||
filename
[
1
]
==
':'
||
...
...
libavcodec/avcodec.h
View file @
da9cea77
...
...
@@ -1274,7 +1274,7 @@ typedef struct AVCodecContext {
* Some codecs need additional format info. It is stored here.
* If any muxer uses this then ALL demuxers/parsers AND encoders for the
* specific codec MUST set it correctly otherwise stream copy breaks.
* In general use of this field by muxers is not recomm
a
nded.
* In general use of this field by muxers is not recomm
e
nded.
* - encoding: Set by libavcodec.
* - decoding: Set by libavcodec. (FIXME: Is this OK?)
*/
...
...
@@ -3444,7 +3444,7 @@ typedef struct ReSampleContext ReSampleContext;
* @param linear if 1 then the used FIR filter will be linearly interpolated
between the 2 closest, if 0 the closest will be used
* @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
* @return allocated ReSampleContext, NULL if error occured
* @return allocated ReSampleContext, NULL if error occur
r
ed
*/
ReSampleContext
*
av_audio_resample_init
(
int
output_channels
,
int
input_channels
,
int
output_rate
,
int
input_rate
,
...
...
libavcodec/bitstream.c
View file @
da9cea77
...
...
@@ -103,7 +103,7 @@ static int alloc_table(VLC *vlc, int size, int use_static)
vlc
->
table_size
+=
size
;
if
(
vlc
->
table_size
>
vlc
->
table_allocated
)
{
if
(
use_static
)
abort
();
//cant do anything, init_vlc() is used with too little memory
abort
();
//
can
no
t do anything, init_vlc() is used with too little memory
vlc
->
table_allocated
+=
(
1
<<
vlc
->
bits
);
vlc
->
table
=
av_realloc
(
vlc
->
table
,
sizeof
(
VLC_TYPE
)
*
2
*
vlc
->
table_allocated
);
...
...
libavcodec/dsputil.h
View file @
da9cea77
...
...
@@ -498,8 +498,8 @@ typedef struct DSPContext {
* with the zigzag/alternate scan<br>
* an example to avoid confusion:
* - (->decode coeffs -> zigzag reorder -> dequant -> reference idct ->...)
* - (x -> referece dct -> reference idct -> x)
* - (x -> referece dct -> simple_mmx_perm = idct_permutation -> simple_idct_mmx -> x)
* - (x -> refere
n
ce dct -> reference idct -> x)
* - (x -> refere
n
ce dct -> simple_mmx_perm = idct_permutation -> simple_idct_mmx -> x)
* - (->decode coeffs -> zigzag reorder -> simple_mmx_perm -> dequant -> simple_idct_mmx ->...)
*/
uint8_t
idct_permutation
[
64
];
...
...
libavcodec/eatgv.c
View file @
da9cea77
...
...
@@ -155,7 +155,7 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b
vector_bits
=
AV_RL16
(
&
buf
[
6
]);
buf
+=
12
;
/* allocate codebook buffers as nec
c
essary */
/* allocate codebook buffers as necessary */
if
(
num_mvs
>
s
->
num_mvs
)
{
s
->
mv_codebook
=
av_realloc
(
s
->
mv_codebook
,
num_mvs
*
2
*
sizeof
(
int
));
s
->
num_mvs
=
num_mvs
;
...
...
@@ -286,7 +286,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
s
->
frame
.
buffer_hints
=
FF_BUFFER_HINTS_VALID
;
s
->
frame
.
linesize
[
0
]
=
s
->
width
;
/* allocate additional 12 bytes to accomodate av_memcpy_backptr() OUTBUF_PADDED optimisation */
/* allocate additional 12 bytes to accom
m
odate av_memcpy_backptr() OUTBUF_PADDED optimisation */
s
->
frame
.
data
[
0
]
=
av_malloc
(
s
->
width
*
s
->
height
+
12
);
if
(
!
s
->
frame
.
data
[
0
])
return
AVERROR
(
ENOMEM
);
...
...
libavcodec/error_resilience.c
View file @
da9cea77
...
...
@@ -790,7 +790,7 @@ void ff_er_frame_end(MpegEncContext *s){
if
(
!
s
->
error_recognition
||
s
->
error_count
==
0
||
s
->
avctx
->
lowres
||
s
->
avctx
->
hwaccel
||
s
->
avctx
->
codec
->
capabilities
&
CODEC_CAP_HWACCEL_VDPAU
||
s
->
picture_structure
!=
PICT_FRAME
||
// we do
n
t support ER of field pictures yet, though it should not crash if enabled
s
->
picture_structure
!=
PICT_FRAME
||
// we do
no
t support ER of field pictures yet, though it should not crash if enabled
s
->
error_count
==
3
*
s
->
mb_width
*
(
s
->
avctx
->
skip_top
+
s
->
avctx
->
skip_bottom
))
return
;
if
(
s
->
current_picture
.
f
.
motion_val
[
0
]
==
NULL
)
{
...
...
libavcodec/g722enc.c
View file @
da9cea77
...
...
@@ -153,7 +153,7 @@ static int g722_encode_trellis(AVCodecContext *avctx,
for
(
j
=
0
;
j
<
frontier
&&
nodes
[
0
][
j
];
j
++
)
{
/* Only k >> 2 affects the future adaptive state, therefore testing
* small steps that don't change k >> 2 is useless, the orignal
* small steps that don't change k >> 2 is useless, the orig
i
nal
* value from encode_low is better than them. Since we step k
* in steps of 4, make sure range is a multiple of 4, so that
* we don't miss the original value from encode_low. */
...
...
libavcodec/h264.c
View file @
da9cea77
...
...
@@ -2893,7 +2893,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
* FIXME: avoiding a memcpy would be nice, but ref handling makes many assumptions
* about there being no actual duplicates.
* FIXME: this doesn't copy padding for out-of-frame motion vectors. Given we're
* concealing a lost frame, this probably isn't noticable by comparison, but it should
* concealing a lost frame, this probably isn't notic
e
able by comparison, but it should
* be fixed. */
if
(
h
->
short_ref_count
)
{
if
(
prev
)
{
...
...
@@ -3316,7 +3316,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h, MpegEncCon
/**
*
* @return non zero if the loop filter can be skiped
* @return non zero if the loop filter can be skip
p
ed
*/
static
int
fill_filter_caches
(
H264Context
*
h
,
int
mb_type
){
MpegEncContext
*
const
s
=
&
h
->
s
;
...
...
@@ -3839,7 +3839,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
av_log
(
h
->
s
.
avctx
,
AV_LOG_ERROR
,
"Invalid mix of idr and non-idr slices"
);
return
-
1
;
}
idr
(
h
);
//FIXME ensure we don't lo
o
se some frames if there is reordering
idr
(
h
);
//
FIXME ensure we don't lose some frames if there is reordering
case
NAL_SLICE
:
init_get_bits
(
&
hx
->
s
.
gb
,
ptr
,
bit_length
);
hx
->
intra_gb_ptr
=
...
...
libavcodec/jfdctint_template.c
View file @
da9cea77
...
...
@@ -340,7 +340,7 @@ FUNC(ff_jpeg_fdct_islow)(DCTELEM *data)
/*
* The secret of DCT2-4-8 is really simple -- you do the usual 1-DCT
* on the rows and then, instead of doing even and odd, part on the colums
* on the rows and then, instead of doing even and odd, part on the colum
n
s
* you do even part two times.
*/
GLOBAL
(
void
)
...
...
libavcodec/lpc.h
View file @
da9cea77
...
...
@@ -67,7 +67,7 @@ typedef struct LPCContext {
* Perform autocorrelation on input samples with delay of 0 to lag.
* @param data input samples.
* constraints: no alignment needed, but must have have at
* least lag*sizeof(double) valid bytes prece
e
ding it, and
* least lag*sizeof(double) valid bytes preceding it, and
* size must be at least (len+1)*sizeof(double) if data is
* 16-byte aligned or (len+2)*sizeof(double) if data is
* unaligned.
...
...
libavcodec/mjpegdec.c
View file @
da9cea77
...
...
@@ -1109,9 +1109,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
av_log
(
s
->
avctx
,
AV_LOG_DEBUG
,
"APPx %8X
\n
"
,
id
);
}
/*
b
uggy AVID, it puts EOI only at every 10th frame */
/*
a
lso this fourcc is used by non-avid files too, it holds some
information
s
, but it's always present in AVID
create
s
files */
/*
B
uggy AVID, it puts EOI only at every 10th frame
.
*/
/*
A
lso
,
this fourcc is used by non-avid files too, it holds some
information, but it's always present in AVID
-
create
d
files
.
*/
if
(
id
==
AV_RL32
(
"AVI1"
))
{
/* structure:
...
...
libavcodec/mpegvideo.h
View file @
da9cea77
...
...
@@ -127,7 +127,7 @@ typedef struct Picture{
int
ref_poc
[
2
][
2
][
16
];
///< h264 POCs of the frames used as reference (FIXME need per slice)
int
ref_count
[
2
][
2
];
///< number of entries in ref_poc (FIXME need per slice)
int
mbaff
;
///< h264 1 -> MBAFF frame 0-> not MBAFF
int
field_picture
;
///< whether or not the picture was encoded in sep
e
rate fields
int
field_picture
;
///< whether or not the picture was encoded in sep
a
rate fields
int
mb_var_sum
;
///< sum of MB variance for current frame
int
mc_mb_var_sum
;
///< motion compensated MB variance for current frame
...
...
libavcodec/proresdec.c
View file @
da9cea77
...
...
@@ -559,7 +559,7 @@ static int decode_slice(AVCodecContext *avctx, ProresThreadData *td)
sf
=
sf
>
128
?
(
sf
-
96
)
<<
2
:
sf
;
/* scale quantization matrixes according with slice's scale factor */
/* TODO: this can be SIMD-optimized alot */
/* TODO: this can be SIMD-optimized a
lot */
if
(
ctx
->
qmat_changed
||
sf
!=
ctx
->
prev_slice_sf
)
{
ctx
->
prev_slice_sf
=
sf
;
for
(
i
=
0
;
i
<
64
;
i
++
)
{
...
...
libavcodec/tscc.c
View file @
da9cea77
...
...
@@ -155,7 +155,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
return
-
1
;
}
c
->
bpp
=
avctx
->
bits_per_coded_sample
;
// buffer size for RLE 'best' case when 2-byte code prece
e
ds each pixel and there may be padding after it too
// buffer size for RLE 'best' case when 2-byte code preced
e
s each pixel and there may be padding after it too
c
->
decomp_size
=
(((
avctx
->
width
*
c
->
bpp
+
7
)
>>
3
)
+
3
*
avctx
->
width
+
2
)
*
avctx
->
height
+
2
;
/* Allocate decompression buffer */
...
...
libavcodec/vaapi_mpeg4.c
View file @
da9cea77
...
...
@@ -98,7 +98,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
pic_param
->
forward_reference_picture
=
ff_vaapi_get_surface_id
(
&
s
->
last_picture
);
/* Fill in VAIQMatrixBufferMPEG4 */
/* Only the first inverse quantisation method uses the weight
h
ing matrices */
/* Only the first inverse quantisation method uses the weighting matrices */
if
(
pic_param
->
vol_fields
.
bits
.
quant_type
)
{
iq_matrix
=
ff_vaapi_alloc_iq_matrix
(
vactx
,
sizeof
(
VAIQMatrixBufferMPEG4
));
if
(
!
iq_matrix
)
...
...
libavcodec/vc1dec.c
View file @
da9cea77
...
...
@@ -3536,7 +3536,7 @@ static void vc1_apply_p_loop_filter(VC1Context *v)
vc1_apply_p_v_loop_filter
(
v
,
i
);
}
/* V always prece
e
des H, therefore we run H one MB before V;
/* V always precedes H, therefore we run H one MB before V;
* at the end of a row, we catch up to complete the row */
if
(
s
->
mb_x
)
{
for
(
i
=
0
;
i
<
6
;
i
++
)
{
...
...
@@ -3573,7 +3573,7 @@ static int vc1_decode_p_mb(VC1Context *v)
int
skipped
,
fourmv
;
int
block_cbp
=
0
,
pat
,
block_tt
=
0
,
block_intra
=
0
;
mquant
=
v
->
pq
;
/*
Loo
sy initialization */
mquant
=
v
->
pq
;
/*
los
sy initialization */
if
(
v
->
mv_type_is_raw
)
fourmv
=
get_bits1
(
gb
);
...
...
@@ -4141,7 +4141,7 @@ static void vc1_decode_b_mb(VC1Context *v)
int
dmv_x
[
2
],
dmv_y
[
2
];
int
bmvtype
=
BMV_TYPE_BACKWARD
;
mquant
=
v
->
pq
;
/*
Loo
sy initialization */
mquant
=
v
->
pq
;
/*
los
sy initialization */
s
->
mb_intra
=
0
;
if
(
v
->
dmb_is_raw
)
...
...
libavcodec/wmaprodec.c
View file @
da9cea77
...
...
@@ -1425,7 +1425,7 @@ static int remaining_bits(WMAProDecodeCtx *s, GetBitContext *gb)
*@param s codec context
*@param gb bitstream reader context
*@param len length of the partial frame
*@param append decides wether to reset the buffer or not
*@param append decides w
h
ether to reset the buffer or not
*/
static
void
save_bits
(
WMAProDecodeCtx
*
s
,
GetBitContext
*
gb
,
int
len
,
int
append
)
...
...
libavcodec/wmavoice.c
View file @
da9cea77
...
...
@@ -189,7 +189,7 @@ typedef struct {
* @{
*/
int
spillover_nbits
;
///< number of bits of the previous packet's
///< last superframe prece
e
ding this
///< last superframe preceding this
///< packet's first full superframe (useful
///< for re-synchronization also)
int
has_residual_lsps
;
///< if set, superframes contain one set of
...
...
@@ -1805,7 +1805,7 @@ static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr)
s
->
frame
.
nb_samples
=
n_samples
;
samples
=
(
float
*
)
s
->
frame
.
data
[
0
];
/* Parse frames, optionally prece
e
ded by per-frame (independent) LSPs. */
/* Parse frames, optionally preceded by per-frame (independent) LSPs. */
for
(
n
=
0
;
n
<
3
;
n
++
)
{
if
(
!
s
->
has_residual_lsps
)
{
int
m
;
...
...
libavcodec/x86/vc1dsp_yasm.asm
View file @
da9cea77
...
...
@@ -227,7 +227,7 @@ section .text
imul
r2
,
0x01010101
%endmacro
; I do
n
t know why the sign extension is needed...
; I do
no
t know why the sign extension is needed...
%macro PSIGNW_SRA_MMX 2
psraw
%
2
,
15
PSIGNW_MMX
%
1
,
%
2
...
...
libavdevice/jack_audio.c
View file @
da9cea77
...
...
@@ -271,7 +271,7 @@ static int audio_read_packet(AVFormatContext *context, AVPacket *pkt)
}
}
/* Wait for a packet com
m
ing back from process_callback(), if one isn't available yet */
/* Wait for a packet coming back from process_callback(), if one isn't available yet */
timeout
.
tv_sec
=
av_gettime
()
/
1000000
+
2
;
if
(
sem_timedwait
(
&
self
->
packet_count
,
&
timeout
))
{
if
(
errno
==
ETIMEDOUT
)
{
...
...
libavdevice/timefilter.h
View file @
da9cea77
...
...
@@ -72,7 +72,7 @@ TimeFilter * ff_timefilter_new(double clock_period, double feedback2_factor, dou
*
* system_time, in seconds, should be the value of the system clock time,
* at (or as close as possible to) the moment the device hardware interrupt
* occured (or any other event the device clock raises at the beginning of a
* occur
r
ed (or any other event the device clock raises at the beginning of a
* cycle).
*
* @return the filtered time, in seconds
...
...
libavformat/avformat.h
View file @
da9cea77
...
...
@@ -685,7 +685,8 @@ typedef struct AVStream {
/**
* last packet in packet_buffer for this stream when muxing.
* used internally, NOT PART OF PUBLIC API, dont read or write from outside of libav*
* Used internally, NOT PART OF PUBLIC API, do not read or
* write from outside of libav*
*/
struct
AVPacketList
*
last_in_packet_buffer
;
#endif
...
...
@@ -709,7 +710,7 @@ typedef struct AVStream {
int
codec_info_nb_frames
;
/**
* Stream information
s
used internally by av_find_stream_info()
* Stream information used internally by av_find_stream_info()
*/
#define MAX_STD_TIMEBASES (60*12+5)
struct
{
...
...
@@ -877,7 +878,7 @@ typedef struct AVFormatContext {
/**
* Decoding: duration of the stream, in AV_TIME_BASE fractional
* seconds. Only set this value if you know none of the individual stream
* durations and also do
n
t set any of them. This is deduced from the
* durations and also do
no
t set any of them. This is deduced from the
* AVStream values if not set.
*/
int64_t
duration
;
...
...
libavformat/flvenc.c
View file @
da9cea77
...
...
@@ -361,7 +361,7 @@ static int flv_write_trailer(AVFormatContext *s)
file_size
=
avio_tell
(
pb
);
/* update information
s
*/
/* update information */
avio_seek
(
pb
,
flv
->
duration_offset
,
SEEK_SET
);
put_amf_double
(
pb
,
flv
->
duration
/
(
double
)
1000
);
avio_seek
(
pb
,
flv
->
filesize_offset
,
SEEK_SET
);
...
...
@@ -412,7 +412,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
}
if
(
enc
->
codec_id
==
CODEC_ID_H264
)
{
/* check if extradata looks like
mp4 formated
*/
/* check if extradata looks like
MP4
*/
if
(
enc
->
extradata_size
>
0
&&
*
(
uint8_t
*
)
enc
->
extradata
!=
1
)
{
if
(
ff_avc_parse_nal_units_buf
(
pkt
->
data
,
&
data
,
&
size
)
<
0
)
return
-
1
;
...
...
libavformat/id3v2.c
View file @
da9cea77
...
...
@@ -142,7 +142,7 @@ static void free_geobtag(void *obj)
* @param maxread Pointer to maximum number of characters to read from the
* AVIOContext. After execution the value is decremented by the number of bytes
* actually read.
* @returns 0 if no error occured, dst is uninitialized on error
* @returns 0 if no error occur
r
ed, dst is uninitialized on error
*/
static
int
decode_str
(
AVFormatContext
*
s
,
AVIOContext
*
pb
,
int
encoding
,
uint8_t
**
dst
,
int
*
maxread
)
...
...
libavformat/img2.c
View file @
da9cea77
...
...
@@ -432,7 +432,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
(
!
st
->
codec
->
extradata_size
&&
AV_RL32
(
pkt
->
data
+
4
)
!=
MKTAG
(
'j'
,
'P'
,
' '
,
' '
))){
// signature
error:
av_log
(
s
,
AV_LOG_ERROR
,
"malform
at
ed
jpeg
2000 codestream
\n
"
);
av_log
(
s
,
AV_LOG_ERROR
,
"malformed
JPEG
2000 codestream
\n
"
);
return
-
1
;
}
}
...
...
libavformat/iv8.c
View file @
da9cea77
...
...
@@ -24,7 +24,7 @@
static
int
probe
(
AVProbeData
*
p
)
{
// the single file
i
have starts with that,
i
do
n
t know if others do too
// the single file
I
have starts with that,
I
do
no
t know if others do
,
too
if
(
p
->
buf
[
0
]
==
1
&&
p
->
buf
[
1
]
==
1
&&
p
->
buf
[
2
]
==
3
...
...
libavformat/mms.h
View file @
da9cea77
...
...
@@ -33,7 +33,7 @@ typedef struct {
/** Buffer for outgoing packets. */
/*@{*/
uint8_t
*
write_out_ptr
;
///< Pointer for writ
t
ing the buffer.
uint8_t
*
write_out_ptr
;
///< Pointer for writing the buffer.
uint8_t
out_buffer
[
512
];
///< Buffer for outgoing packet.
/*@}*/
...
...
libavformat/movenc.c
View file @
da9cea77
...
...
@@ -243,7 +243,7 @@ static int mov_write_ac3_tag(AVIOContext *pb, MOVTrack *track)
/**
* This function writes extradata "as is".
* Extradata must be formated like a valid atom (with size and tag)
* Extradata must be format
t
ed like a valid atom (with size and tag)
.
*/
static
int
mov_write_extradata_tag
(
AVIOContext
*
pb
,
MOVTrack
*
track
)
{
...
...
libavformat/mpegts.c
View file @
da9cea77
...
...
@@ -456,7 +456,7 @@ static inline int get16(const uint8_t **pp, const uint8_t *p_end)
return
c
;
}
/* read and allocate a DVB string prece
e
ded by its length */
/* read and allocate a DVB string preceded by its length */
static
char
*
getstr8
(
const
uint8_t
**
pp
,
const
uint8_t
*
p_end
)
{
int
len
;
...
...
@@ -1672,7 +1672,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
return
0
;
p
=
packet
+
4
;
if
(
has_adaptation
)
{
/* skip adapation field */
/* skip adap
t
ation field */
p
+=
p
[
0
]
+
1
;