Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
8c1b942a
Commit
8c1b942a
authored
Aug 27, 2014
by
James Darnley
Committed by
Lou Logan
Aug 28, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace incorrect use of "multiply" with "multiple"
Also replace the plural form "multiplies" with "multiples".
parent
e6516944
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
fftools-common-opts.texi
doc/fftools-common-opts.texi
+1
-1
dirac.c
libavcodec/dirac.c
+1
-1
mpeg12enc.c
libavcodec/mpeg12enc.c
+1
-1
msvideo1enc.c
libavcodec/msvideo1enc.c
+1
-1
frame.h
libavutil/frame.h
+1
-1
No files found.
doc/fftools-common-opts.texi
View file @
8c1b942a
...
...
@@ -3,7 +3,7 @@ representing a number as input, which may be followed by one of the SI
unit prefixes, for example: 'K', 'M', or 'G'.
If 'i' is appended to the SI unit prefix, the complete prefix will be
interpreted as a unit prefix for binary multipl
i
es, which are based on
interpreted as a unit prefix for binary multiples, which are based on
powers of 1024 instead of powers of 1000. Appending 'B' to the SI unit
prefix multiplies the value by 8. This allows using, for example:
'KB', 'MiB', 'G' and 'B' as number suffixes.
...
...
libavcodec/dirac.c
View file @
8c1b942a
...
...
@@ -239,7 +239,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
avctx
->
pix_fmt
=
dirac_pix_fmt
[
!
luma_offset
][
source
->
chroma_format
];
avcodec_get_chroma_sub_sample
(
avctx
->
pix_fmt
,
&
chroma_x_shift
,
&
chroma_y_shift
);
if
((
source
->
width
%
(
1
<<
chroma_x_shift
))
||
(
source
->
height
%
(
1
<<
chroma_y_shift
)))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Dimensions must be a
integer multiply
of the chroma subsampling
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"Dimensions must be a
n integer multiple
of the chroma subsampling
\n
"
);
return
AVERROR_INVALIDDATA
;
}
...
...
libavcodec/mpeg12enc.c
View file @
8c1b942a
...
...
@@ -199,7 +199,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
if
(
s
->
strict_std_compliance
>
FF_COMPLIANCE_UNOFFICIAL
)
{
if
((
avctx
->
width
&
0xFFF
)
==
0
||
(
avctx
->
height
&
0xFFF
)
==
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Width or Height are not allowed to be multipl
i
es of 4096
\n
"
av_log
(
avctx
,
AV_LOG_ERROR
,
"Width or Height are not allowed to be multiples of 4096
\n
"
"add '-strict %d' if you want to use them anyway.
\n
"
,
FF_COMPLIANCE_UNOFFICIAL
);
return
AVERROR
(
EINVAL
);
}
...
...
libavcodec/msvideo1enc.c
View file @
8c1b942a
...
...
@@ -266,7 +266,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
return
-
1
;
}
if
((
avctx
->
width
&
3
)
||
(
avctx
->
height
&
3
)){
av_log
(
avctx
,
AV_LOG_ERROR
,
"width and height must be multipl
i
es of 4
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"width and height must be multiples of 4
\n
"
);
return
-
1
;
}
...
...
libavutil/frame.h
View file @
8c1b942a
...
...
@@ -162,7 +162,7 @@ typedef struct AVFrame {
* For audio, only linesize[0] may be set. For planar audio, each channel
* plane must be the same size.
*
* For video the linesizes should be multipl
i
es of the CPUs alignment
* For video the linesizes should be multiples of the CPUs alignment
* preference, this is 16 or 32 for modern desktop CPUs.
* Some code requires such alignment other code can be slower without
* correct alignment, for yet other it makes no difference.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment