Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
c1906e6c
Commit
c1906e6c
authored
Feb 21, 2014
by
jehan
Browse files
Revert "fix compilation issue with clang/32bits"
This reverts commit
b117f2c9
. %zu not supported yet on ms platform
parent
b117f2c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
src/videofilters/h264dec.c
src/videofilters/h264dec.c
+2
-2
src/videofilters/qtcapture.m
src/videofilters/qtcapture.m
+1
-1
src/videofilters/videodec.c
src/videofilters/videodec.c
+3
-3
No files found.
src/videofilters/h264dec.c
View file @
c1906e6c
...
...
@@ -153,7 +153,7 @@ static bool_t check_sps_change(DecData *d, mblk_t *sps){
if
(
d
->
sps
){
ret
=
(
msgdsize
(
sps
)
!=
msgdsize
(
d
->
sps
))
||
(
memcmp
(
d
->
sps
->
b_rptr
,
sps
->
b_rptr
,
msgdsize
(
sps
))
!=
0
);
if
(
ret
)
{
ms_message
(
"SPS changed ! %
zu,%zu"
,
msgdsize
(
sps
),
msgdsize
(
d
->
sps
));
ms_message
(
"SPS changed ! %
i,%i"
,(
int
)
msgdsize
(
sps
),
(
int
)
msgdsize
(
d
->
sps
));
update_sps
(
d
,
sps
);
update_pps
(
d
,
NULL
);
}
...
...
@@ -169,7 +169,7 @@ static bool_t check_pps_change(DecData *d, mblk_t *pps){
if
(
d
->
pps
){
ret
=
(
msgdsize
(
pps
)
!=
msgdsize
(
d
->
pps
))
||
(
memcmp
(
d
->
pps
->
b_rptr
,
pps
->
b_rptr
,
msgdsize
(
pps
))
!=
0
);
if
(
ret
)
{
ms_message
(
"PPS changed ! %
zu,%zu"
,
msgdsize
(
pps
),
msgdsize
(
d
->
pps
));
ms_message
(
"PPS changed ! %
i,%i"
,(
int
)
msgdsize
(
pps
),
(
int
)
msgdsize
(
d
->
pps
));
update_pps
(
d
,
pps
);
}
}
else
{
...
...
src/videofilters/qtcapture.m
View file @
c1906e6c
...
...
@@ -272,7 +272,7 @@ static MSPixFmt ostype_to_pix_fmt(OSType pixelFormat, bool printFmtName){
-
(
void
)
setSize
:(
MSVideoSize
)
size
{
NSDictionary
*
dic
;
if
(
forcedPixelFormat
!=
0
)
{
ms_message
(
"QTCapture set size w=%i, h=%i fmt=%i"
,
size
.
width
,
size
.
height
,
(
unsigned
int
)
forcedPixelFormat
);
ms_message
(
"QTCapture set size w=%i, h=%i fmt=%i"
,
size
.
width
,
size
.
height
,
forcedPixelFormat
);
dic
=
[
NSDictionary
dictionaryWithObjectsAndKeys
:
[
NSNumber
numberWithInteger
:
size
.
width
],
(
id
)
kCVPixelBufferWidthKey
,
[
NSNumber
numberWithInteger
:
size
.
height
],(
id
)
kCVPixelBufferHeightKey
,
...
...
src/videofilters/videodec.c
View file @
c1906e6c
...
...
@@ -156,7 +156,7 @@ static mblk_t * skip_rfc2190_header(mblk_t *inm){
unsigned
hdrLen
;
char
mode
;
if
(
msgdsize
(
inm
)
<
5
)
{
ms_warning
(
"RFC2190 packet too small (size %
zu
) to scan!"
,
msgdsize
(
inm
));
ms_warning
(
"RFC2190 packet too small (size %
d
) to scan!"
,
(
int
)
msgdsize
(
inm
));
freemsg
(
inm
);
return
NULL
;
}
...
...
@@ -177,8 +177,8 @@ static mblk_t * skip_rfc2190_header(mblk_t *inm){
inm
->
reserved2
|=
(
sbit
<<
11
);
inm
->
b_rptr
+=
hdrLen
;
}
else
{
ms_warning
(
"RFC2190 packet mode:%c%s too small (size %
zu
)"
,
mode
,
isIFrame
?
" (I-Frame)"
:
""
,
msgdsize
(
inm
));
ms_warning
(
"RFC2190 packet mode:%c%s too small (size %
d
)"
,
mode
,
isIFrame
?
" (I-Frame)"
:
""
,
(
int
)
msgdsize
(
inm
));
freemsg
(
inm
);
inm
=
NULL
;
}
...
...
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