Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
be73d76b
Commit
be73d76b
authored
Jun 30, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosmetics: fix some then/than typos
parent
d7537a6f
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
avcodec.h
libavcodec/avcodec.h
+1
-1
dca.c
libavcodec/dca.c
+1
-1
dsputil.h
libavcodec/dsputil.h
+2
-2
get_bits.h
libavcodec/get_bits.h
+2
-2
mpegvideo_enc.c
libavcodec/mpegvideo_enc.c
+2
-2
pgssubdec.c
libavcodec/pgssubdec.c
+1
-1
No files found.
libavcodec/avcodec.h
View file @
be73d76b
...
@@ -1363,7 +1363,7 @@ typedef struct AVCodecContext {
...
@@ -1363,7 +1363,7 @@ typedef struct AVCodecContext {
* A demuxer should set this to what is stored in the field used to identify the codec.
* A demuxer should set this to what is stored in the field used to identify the codec.
* If there are multiple such fields in a container then the demuxer should choose the one
* If there are multiple such fields in a container then the demuxer should choose the one
* which maximizes the information about the used codec.
* which maximizes the information about the used codec.
* If the codec tag field in a container is larger th
e
n 32 bits then the demuxer should
* If the codec tag field in a container is larger th
a
n 32 bits then the demuxer should
* remap the longer ID to 32 bits with a table or other structure. Alternatively a new
* remap the longer ID to 32 bits with a table or other structure. Alternatively a new
* extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
* extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
* first.
* first.
...
...
libavcodec/dca.c
View file @
be73d76b
...
@@ -1316,7 +1316,7 @@ static int dca_convert_bitstream(const uint8_t * src, int src_size, uint8_t * ds
...
@@ -1316,7 +1316,7 @@ static int dca_convert_bitstream(const uint8_t * src, int src_size, uint8_t * ds
PutBitContext
pb
;
PutBitContext
pb
;
if
((
unsigned
)
src_size
>
(
unsigned
)
max_size
)
{
if
((
unsigned
)
src_size
>
(
unsigned
)
max_size
)
{
// av_log(NULL, AV_LOG_ERROR, "Input frame size larger th
e
n DCA_MAX_FRAME_SIZE!\n");
// av_log(NULL, AV_LOG_ERROR, "Input frame size larger th
a
n DCA_MAX_FRAME_SIZE!\n");
// return -1;
// return -1;
src_size
=
max_size
;
src_size
=
max_size
;
}
}
...
...
libavcodec/dsputil.h
View file @
be73d76b
...
@@ -150,7 +150,7 @@ void clear_blocks_c(DCTELEM *blocks);
...
@@ -150,7 +150,7 @@ void clear_blocks_c(DCTELEM *blocks);
/* add and put pixel (decoding) */
/* add and put pixel (decoding) */
// blocksizes for op_pixels_func are 8x4,8x8 16x8 16x16
// blocksizes for op_pixels_func are 8x4,8x8 16x8 16x16
//h for op_pixels_func is limited to {width/2, width} but never larger than 16 and never smaller th
e
n 4
//h for op_pixels_func is limited to {width/2, width} but never larger than 16 and never smaller th
a
n 4
typedef
void
(
*
op_pixels_func
)(
uint8_t
*
block
/*align width (8 or 16)*/
,
const
uint8_t
*
pixels
/*align 1*/
,
int
line_size
,
int
h
);
typedef
void
(
*
op_pixels_func
)(
uint8_t
*
block
/*align width (8 or 16)*/
,
const
uint8_t
*
pixels
/*align 1*/
,
int
line_size
,
int
h
);
typedef
void
(
*
tpel_mc_func
)(
uint8_t
*
block
/*align width (8 or 16)*/
,
const
uint8_t
*
pixels
/*align 1*/
,
int
line_size
,
int
w
,
int
h
);
typedef
void
(
*
tpel_mc_func
)(
uint8_t
*
block
/*align width (8 or 16)*/
,
const
uint8_t
*
pixels
/*align 1*/
,
int
line_size
,
int
w
,
int
h
);
typedef
void
(
*
qpel_mc_func
)(
uint8_t
*
dst
/*align width (8 or 16)*/
,
uint8_t
*
src
/*align 1*/
,
int
stride
);
typedef
void
(
*
qpel_mc_func
)(
uint8_t
*
dst
/*align width (8 or 16)*/
,
uint8_t
*
src
/*align 1*/
,
int
stride
);
...
@@ -183,7 +183,7 @@ static void a(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
...
@@ -183,7 +183,7 @@ static void a(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
}
}
/* motion estimation */
/* motion estimation */
// h is limited to {width/2, width, 2*width} but never larger than 16 and never smaller th
e
n 2
// h is limited to {width/2, width, 2*width} but never larger than 16 and never smaller th
a
n 2
// although currently h<4 is not used as functions with width <8 are neither used nor implemented
// although currently h<4 is not used as functions with width <8 are neither used nor implemented
typedef
int
(
*
me_cmp_func
)(
void
/*MpegEncContext*/
*
s
,
uint8_t
*
blk1
/*align width (8 or 16)*/
,
uint8_t
*
blk2
/*align 1*/
,
int
line_size
,
int
h
)
/* __attribute__ ((const))*/
;
typedef
int
(
*
me_cmp_func
)(
void
/*MpegEncContext*/
*
s
,
uint8_t
*
blk1
/*align width (8 or 16)*/
,
uint8_t
*
blk2
/*align 1*/
,
int
line_size
,
int
h
)
/* __attribute__ ((const))*/
;
...
...
libavcodec/get_bits.h
View file @
be73d76b
...
@@ -381,7 +381,7 @@ static inline int check_marker(GetBitContext *s, const char *msg)
...
@@ -381,7 +381,7 @@ static inline int check_marker(GetBitContext *s, const char *msg)
/**
/**
* init GetBitContext.
* init GetBitContext.
* @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger th
e
n the actual read bits
* @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger th
a
n the actual read bits
* because some optimized bitstream readers read 32 or 64 bit at once and could read over the end
* because some optimized bitstream readers read 32 or 64 bit at once and could read over the end
* @param bit_size the size of the buffer in bits
* @param bit_size the size of the buffer in bits
*
*
...
@@ -504,7 +504,7 @@ void free_vlc(VLC *vlc);
...
@@ -504,7 +504,7 @@ void free_vlc(VLC *vlc);
/**
/**
* parses a vlc code, faster th
e
n get_vlc()
* parses a vlc code, faster th
a
n get_vlc()
* @param bits is the number of bits which will be read at once, must be
* @param bits is the number of bits which will be read at once, must be
* identical to nb_bits in init_vlc()
* identical to nb_bits in init_vlc()
* @param max_depth is the number of times bits bits must be read to completely
* @param max_depth is the number of times bits bits must be read to completely
...
...
libavcodec/mpegvideo_enc.c
View file @
be73d76b
...
@@ -1787,7 +1787,7 @@ static av_always_inline void encode_mb(MpegEncContext *s, int motion_x, int moti
...
@@ -1787,7 +1787,7 @@ static av_always_inline void encode_mb(MpegEncContext *s, int motion_x, int moti
static
inline
void
copy_context_before_encode
(
MpegEncContext
*
d
,
MpegEncContext
*
s
,
int
type
){
static
inline
void
copy_context_before_encode
(
MpegEncContext
*
d
,
MpegEncContext
*
s
,
int
type
){
int
i
;
int
i
;
memcpy
(
d
->
last_mv
,
s
->
last_mv
,
2
*
2
*
2
*
sizeof
(
int
));
//FIXME is memcpy faster th
e
n a loop?
memcpy
(
d
->
last_mv
,
s
->
last_mv
,
2
*
2
*
2
*
sizeof
(
int
));
//FIXME is memcpy faster th
a
n a loop?
/* mpeg1 */
/* mpeg1 */
d
->
mb_skip_run
=
s
->
mb_skip_run
;
d
->
mb_skip_run
=
s
->
mb_skip_run
;
...
@@ -1816,7 +1816,7 @@ static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *
...
@@ -1816,7 +1816,7 @@ static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *
int
i
;
int
i
;
memcpy
(
d
->
mv
,
s
->
mv
,
2
*
4
*
2
*
sizeof
(
int
));
memcpy
(
d
->
mv
,
s
->
mv
,
2
*
4
*
2
*
sizeof
(
int
));
memcpy
(
d
->
last_mv
,
s
->
last_mv
,
2
*
2
*
2
*
sizeof
(
int
));
//FIXME is memcpy faster th
e
n a loop?
memcpy
(
d
->
last_mv
,
s
->
last_mv
,
2
*
2
*
2
*
sizeof
(
int
));
//FIXME is memcpy faster th
a
n a loop?
/* mpeg1 */
/* mpeg1 */
d
->
mb_skip_run
=
s
->
mb_skip_run
;
d
->
mb_skip_run
=
s
->
mb_skip_run
;
...
...
libavcodec/pgssubdec.c
View file @
be73d76b
...
@@ -198,7 +198,7 @@ static int parse_picture_segment(AVCodecContext *avctx,
...
@@ -198,7 +198,7 @@ static int parse_picture_segment(AVCodecContext *avctx,
/* Make sure the bitmap is not too large */
/* Make sure the bitmap is not too large */
if
(
avctx
->
width
<
width
||
avctx
->
height
<
height
)
{
if
(
avctx
->
width
<
width
||
avctx
->
height
<
height
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Bitmap dimensions larger th
e
n video.
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"Bitmap dimensions larger th
a
n video.
\n
"
);
return
-
1
;
return
-
1
;
}
}
...
...
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