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
7ce68923
Commit
7ce68923
authored
Mar 10, 2008
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
misc spelling fixes
Originally committed as revision 12410 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
06de58d2
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
25 additions
and
22 deletions
+25
-22
libavcodec/avcodec.h
libavcodec/avcodec.h
+1
-1
libavcodec/dsputil.h
libavcodec/dsputil.h
+8
-5
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_enc.c
+1
-1
libavcodec/ppc/mpegvideo_altivec.c
libavcodec/ppc/mpegvideo_altivec.c
+1
-1
libavformat/mov.c
libavformat/mov.c
+3
-3
libavformat/nutenc.c
libavformat/nutenc.c
+3
-3
libavutil/aes.h
libavutil/aes.h
+2
-2
libavutil/avutil.h
libavutil/avutil.h
+1
-1
libavutil/bswap.h
libavutil/bswap.h
+1
-1
libavutil/common.h
libavutil/common.h
+1
-1
libavutil/mem.c
libavutil/mem.c
+2
-2
libpostproc/postprocess.h
libpostproc/postprocess.h
+1
-1
No files found.
libavcodec/avcodec.h
View file @
7ce68923
...
...
@@ -296,7 +296,7 @@ enum CodecID {
CODEC_ID_SSA
,
CODEC_ID_MOV_TEXT
,
/* other specific kind of codecs (generaly used for attachments) */
/* other specific kind of codecs (general
l
y used for attachments) */
CODEC_ID_TTF
=
0x18000
,
CODEC_ID_MPEG2TS
=
0x20000
,
/**< _FAKE_ codec to indicate a raw MPEG-2 TS
...
...
libavcodec/dsputil.h
View file @
7ce68923
...
...
@@ -93,11 +93,14 @@ void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy,
int
dxx
,
int
dxy
,
int
dyx
,
int
dyy
,
int
shift
,
int
r
,
int
width
,
int
height
);
/* minimum alignment rules ;)
if u notice errors in the align stuff, need more alignment for some asm code for some cpu
or need to use a function with less aligned data then send a mail to the ffmpeg-dev list, ...
!warning these alignments might not match reallity, (missing attribute((align)) stuff somewhere possible)
i (michael) didnt check them, these are just the alignents which i think could be reached easily ...
If you notice errors in the align stuff, need more alignment for some ASM code
for some CPU or need to use a function with less aligned data then send a mail
to the ffmpeg-devel mailing list, ...
!warning These alignments might not match reality, (missing attribute((align))
stuff somewhere possible).
I (Michael) did not check them, these are just the alignments which i think
could be reached easily ...
!future video codecs might need functions with less strict alignment
*/
...
...
libavcodec/mpegvideo_enc.c
View file @
7ce68923
...
...
@@ -425,7 +425,7 @@ int MPV_encode_init(AVCodecContext *avctx)
}
if
(
s
->
avctx
->
scenechange_threshold
<
1000000000
&&
(
s
->
flags
&
CODEC_FLAG_CLOSED_GOP
)){
av_log
(
avctx
,
AV_LOG_ERROR
,
"closed gop with scene change detection are
n
t supported yet, set threshold to 1000000000
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"closed gop with scene change detection are
no
t supported yet, set threshold to 1000000000
\n
"
);
return
-
1
;
}
...
...
libavcodec/ppc/mpegvideo_altivec.c
View file @
7ce68923
...
...
@@ -197,7 +197,7 @@ int dct_quantize_altivec(MpegEncContext* s,
// z4 = vec_add(z4, z5); // z4 += z5;
// z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
// Wow! It's actually more eff
e
cient to roll this multiply
// Wow! It's actually more eff
i
cient to roll this multiply
// into the adds below, even thought the multiply gets done twice!
// z2 = vec_madd(z2, vec_2_562915447, (vector float)zero);
...
...
libavformat/mov.c
View file @
7ce68923
...
...
@@ -665,9 +665,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
(
c
->
fc
->
video_codec_id
?
codec_get_id
(
codec_movvideo_tags
,
format
)
!=
c
->
fc
->
video_codec_id
:
st
->
codec
->
codec_tag
!=
MKTAG
(
'j'
,
'p'
,
'e'
,
'g'
))
){
/*
m
ultiple fourcc, we skip
jpeg, t
his is
n
t correct, we should
export it as
sep
e
rate AVStream but this needs a few changes
in the mov demuxer, patch
welcome */
/*
M
ultiple fourcc, we skip
JPEG. T
his is
no
t correct, we should
* export it as a
sep
a
rate AVStream but this needs a few changes
* in the MOV demuxer, patch
welcome
.
*/
url_fskip
(
pb
,
size
-
(
url_ftell
(
pb
)
-
start_pos
));
continue
;
}
...
...
libavformat/nutenc.c
View file @
7ce68923
...
...
@@ -69,7 +69,7 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint
header
|=
1
<<
16
;
//no crc
AV_WB32
(
out
,
header
);
if
(
size
<=
0
)
return
2
;
//we guess theres no crc, if there is one the user clearly does
n
t care about overhead
return
2
;
//we guess there
i
s no crc, if there is one the user clearly does
no
t care about overhead
if
(
bitrate_index
==
30
)
return
-
1
;
//something is wrong ...
...
...
@@ -78,8 +78,8 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint
header
|=
(
bitrate_index
&
1
)
<<
9
;
return
2
;
//FIXME actually put the needed ones in build_elision_headers()
return
3
;
//we guess that the private bit is
n
t set
//FIXME the above asum
ta
tions should be checked, if these turn out false too often something should be done
return
3
;
//we guess that the private bit is
no
t set
//FIXME the above as
s
um
p
tions should be checked, if these turn out false too often something should be done
}
return
0
;
}
...
...
libavutil/aes.h
View file @
7ce68923
...
...
@@ -28,14 +28,14 @@ extern const int av_aes_size;
struct
AVAES
;
/**
*
i
nitializes an AVAES context
*
I
nitializes an AVAES context
.
* @param key_bits 128, 192 or 256
* @param decrypt 0 for encryption, 1 for decryption
*/
int
av_aes_init
(
struct
AVAES
*
a
,
const
uint8_t
*
key
,
int
key_bits
,
int
decrypt
);
/**
*
e
ncrypts / decrypts.
*
E
ncrypts / decrypts.
* @param count number of 16 byte blocks
* @param dst destination array, can be equal to src
* @param src source array, can be equal to dst
...
...
libavutil/avutil.h
View file @
7ce68923
...
...
@@ -23,7 +23,7 @@
/**
* @file avutil.h
* external
api
header
.
* external
API
header
*/
...
...
libavutil/bswap.h
View file @
7ce68923
...
...
@@ -20,7 +20,7 @@
/**
* @file bswap.h
* byte swap
.
* byte swap
ping routines
*/
#ifndef FFMPEG_BSWAP_H
...
...
libavutil/common.h
View file @
7ce68923
...
...
@@ -20,7 +20,7 @@
/**
* @file common.h
* common internal and external
api
header
.
* common internal and external
API
header
*/
#ifndef FFMPEG_COMMON_H
...
...
libavutil/mem.c
View file @
7ce68923
...
...
@@ -69,10 +69,10 @@ void *av_malloc(unsigned int size)
But I don't want to code such logic here!
*/
/* Why 16?
b
ecause some
cpu
s need alignment, for example SSE2 on P4, & most RISC
cpu
s
B
ecause some
CPU
s need alignment, for example SSE2 on P4, & most RISC
CPU
s
it will just trigger an exception and the unaligned load will be done in the
exception handler or it will just segfault (SSE2 on P4)
Why not larger? because i did
n
t see a difference in benchmarks ...
Why not larger? because i did
no
t see a difference in benchmarks ...
*/
/* benchmarks with p3
memalign(64)+1 3071,3051,3032
...
...
libpostproc/postprocess.h
View file @
7ce68923
...
...
@@ -24,7 +24,7 @@
/**
* @file postprocess.h
* @brief
* external
api for the pp stuff
* external
postprocessing API
*/
#include "libavutil/avutil.h"
...
...
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