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
3323c5f3
Commit
3323c5f3
authored
Jun 13, 2015
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove a few occurences of "long long" from the libraries.
parent
178ba1fd
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
cinepakenc.c
libavcodec/cinepakenc.c
+7
-7
iec61883.c
libavdevice/iec61883.c
+1
-1
libnut.c
libavformat/libnut.c
+1
-1
mp3dec.c
libavformat/mp3dec.c
+1
-1
postprocess_template.c
libpostproc/postprocess_template.c
+1
-1
No files found.
libavcodec/cinepakenc.c
View file @
3323c5f3
...
...
@@ -327,7 +327,7 @@ static int64_t calculate_mode_score(CinepakEncContext *s, int h, strip_info *inf
(
info
->
v4_size
?
CHUNK_HEADER_SIZE
+
info
->
v4_size
*
entry_size
:
0
)
+
CHUNK_HEADER_SIZE
)
<<
3
;
//av_log(s->avctx, AV_LOG_INFO, "sizes %3i %3i -> %9
lli score mb_count %i", info->v1_size, info->v4_size, (long long int)
ret, mb_count);
//av_log(s->avctx, AV_LOG_INFO, "sizes %3i %3i -> %9
"PRId64" score mb_count %i", info->v1_size, info->v4_size,
ret, mb_count);
#ifdef CINEPAK_REPORT_SERR
*
serr
=
0
;
...
...
@@ -897,7 +897,7 @@ static int quantize(CinepakEncContext *s, int h, AVPicture *pict,
// check that we did it right in the beginning of the function
av_assert0
(
i
>=
size
);
// training set is no smaller than the codebook
//av_log(s->avctx, AV_LOG_INFO, "isv1 %i size= %i i= %i error %
lli\n", v1mode, size, i, (long long int)
total_error);
//av_log(s->avctx, AV_LOG_INFO, "isv1 %i size= %i i= %i error %
"PRId64"\n", v1mode, size, i,
total_error);
return
size
;
}
...
...
@@ -1050,7 +1050,7 @@ static int rd_strip(CinepakEncContext *s, int y, int h, int keyframe, AVPicture
}
}
//av_log(s->avctx, AV_LOG_INFO, "%3i %3i score = %
lli\n", v1_size, v4_size, (long long int)
score);
//av_log(s->avctx, AV_LOG_INFO, "%3i %3i score = %
"PRId64"\n", v1_size, v4_size,
score);
if
(
best_size
==
0
||
score
<
*
best_score
)
{
...
...
@@ -1060,10 +1060,10 @@ static int rd_strip(CinepakEncContext *s, int y, int h, int keyframe, AVPicture
#endif
best_size
=
encode_mode
(
s
,
h
,
scratch_pict
,
last_pict
,
&
info
,
s
->
strip_buf
+
STRIP_HEADER_SIZE
);
//av_log(s->avctx, AV_LOG_INFO, "mode %i, %3i, %3i: %18
lli %i B", mode, info.v1_size, info.v4_size, (long long int)
score, best_size);
//av_log(s->avctx, AV_LOG_INFO, "mode %i, %3i, %3i: %18
"PRId64" %i B", mode, info.v1_size, info.v4_size,
score, best_size);
//av_log(s->avctx, AV_LOG_INFO, "\n");
#ifdef CINEPAK_REPORT_SERR
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"mode %i, %3i, %3i: %18
lli %i B
\n
"
,
mode
,
v1_size
,
v4_size
,
(
long
long
int
)
serr
,
best_size
);
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"mode %i, %3i, %3i: %18
"
PRId64
" %i B
\n
"
,
mode
,
v1_size
,
v4_size
,
serr
,
best_size
);
#endif
#ifdef CINEPAKENC_DEBUG
...
...
@@ -1224,9 +1224,9 @@ static int rd_frame(CinepakEncContext *s, const AVFrame *frame, int isakeyframe,
best_serr
=
serr
;
#endif
best_size
=
size
+
write_cvid_header
(
s
,
s
->
frame_buf
,
num_strips
,
size
,
isakeyframe
);
//av_log(s->avctx, AV_LOG_INFO, "best number of strips so far: %2i, %12
lli, %i B\n", num_strips, (long long int)
score, best_size);
//av_log(s->avctx, AV_LOG_INFO, "best number of strips so far: %2i, %12
"PRId64", %i B\n", num_strips,
score, best_size);
#ifdef CINEPAK_REPORT_SERR
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"best number of strips so far: %2i, %12
lli, %i B
\n
"
,
num_strips
,
(
long
long
int
)
serr
,
best_size
);
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"best number of strips so far: %2i, %12
"
PRId64
", %i B
\n
"
,
num_strips
,
serr
,
best_size
);
#endif
FFSWAP
(
AVFrame
*
,
s
->
best_frame
,
s
->
scratch_frame
);
...
...
libavdevice/iec61883.c
View file @
3323c5f3
...
...
@@ -271,7 +271,7 @@ static int iec61883_read_header(AVFormatContext *context)
}
if
(
dv
->
device_guid
)
{
if
(
sscanf
(
dv
->
device_guid
,
"%
llx"
,
(
long
long
unsigned
int
*
)
&
guid
)
!=
1
)
{
if
(
sscanf
(
dv
->
device_guid
,
"%
"
SCNu64
,
&
guid
)
!=
1
)
{
av_log
(
context
,
AV_LOG_INFO
,
"Invalid dvguid parameter: %s
\n
"
,
dv
->
device_guid
);
goto
fail
;
...
...
libavformat/libnut.c
View file @
3323c5f3
...
...
@@ -179,7 +179,7 @@ static size_t av_read(void * h, size_t len, uint8_t * buf) {
return
avio_read
(
bc
,
buf
,
len
);
}
static
off_t
av_seek
(
void
*
h
,
long
long
pos
,
int
whence
)
{
static
off_t
av_seek
(
void
*
h
,
int64_t
pos
,
int
whence
)
{
AVIOContext
*
bc
=
h
;
if
(
whence
==
SEEK_END
)
{
pos
=
avio_size
(
bc
)
+
pos
;
...
...
libavformat/mp3dec.c
View file @
3323c5f3
...
...
@@ -377,7 +377,7 @@ static int mp3_read_header(AVFormatContext *s)
if
(
!
(
i
&
1023
))
ffio_ensure_seekback
(
s
->
pb
,
i
+
1024
+
4
);
if
(
check
(
s
,
off
+
i
)
>=
0
)
{
av_log
(
s
,
AV_LOG_INFO
,
"Skipping %d bytes of junk at %
lld.
\n
"
,
i
,
(
long
long
)
off
);
av_log
(
s
,
AV_LOG_INFO
,
"Skipping %d bytes of junk at %
"
PRId64
".
\n
"
,
i
,
off
);
avio_seek
(
s
->
pb
,
off
+
i
,
SEEK_SET
);
break
;
}
...
...
libpostproc/postprocess_template.c
View file @
3323c5f3
...
...
@@ -1383,7 +1383,7 @@ DERING_CORE((%0, %1, 8) ,(%%REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,%%mm1,
#ifdef DEBUG_DERING_THRESHOLD
__asm__
volatile
(
"emms
\n\t
"
:
);
{
static
long
long
numPixels
=
0
;
static
uint64_t
numPixels
=
0
;
if
(
x
!=
1
&&
x
!=
8
&&
y
!=
1
&&
y
!=
8
)
numPixels
++
;
// if((max-min)<20 || (max-min)*QP<200)
// if((max-min)*QP < 500)
...
...
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