Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
f407de16
Commit
f407de16
authored
Aug 29, 2006
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compiler warnings (mismatch in datatypes)
parent
50491f17
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
modules/codec/ffmpeg/demux.c
modules/codec/ffmpeg/demux.c
+1
-1
modules/codec/ffmpeg/encoder.c
modules/codec/ffmpeg/encoder.c
+4
-4
modules/codec/ffmpeg/video.c
modules/codec/ffmpeg/video.c
+4
-4
No files found.
modules/codec/ffmpeg/demux.c
View file @
f407de16
...
@@ -338,7 +338,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
...
@@ -338,7 +338,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
*
pf
=
(
double
)
stream_Tell
(
p_demux
->
s
)
/
(
double
)
i64
;
*
pf
=
(
double
)
stream_Tell
(
p_demux
->
s
)
/
(
double
)
i64
;
}
}
if
(
p_sys
->
ic
->
duration
!=
AV_NOPTS_VALUE
&&
p_sys
->
i_pcr
>
0
)
if
(
(
p_sys
->
ic
->
duration
!=
AV_NOPTS_VALUE
)
&&
(
p_sys
->
i_pcr
>
0
)
)
{
{
*
pf
=
(
double
)
p_sys
->
i_pcr
/
(
double
)
p_sys
->
ic
->
duration
;
*
pf
=
(
double
)
p_sys
->
i_pcr
/
(
double
)
p_sys
->
ic
->
duration
;
}
}
...
...
modules/codec/ffmpeg/encoder.c
View file @
f407de16
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
#endif
#endif
#if LIBAVCODEC_BUILD < 4704
#if LIBAVCODEC_BUILD < 4704
# define AV_NOPTS_VALUE 0
# define AV_NOPTS_VALUE
(int64_t)
0
#endif
#endif
#if LIBAVCODEC_BUILD < 4684
#if LIBAVCODEC_BUILD < 4684
# define FF_QP2LAMBDA 118
# define FF_QP2LAMBDA 118
...
@@ -877,7 +877,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
...
@@ -877,7 +877,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
#endif
#endif
/* End work-around */
/* End work-around */
i_out
=
avcodec_encode_video
(
p_sys
->
p_context
,
p_sys
->
p_buffer_out
,
i_out
=
avcodec_encode_video
(
p_sys
->
p_context
,
(
uint8_t
*
)
p_sys
->
p_buffer_out
,
AVCODEC_MAX_VIDEO_FRAME_SIZE
,
&
frame
);
AVCODEC_MAX_VIDEO_FRAME_SIZE
,
&
frame
);
if
(
i_out
>
0
)
if
(
i_out
>
0
)
...
@@ -968,7 +968,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
...
@@ -968,7 +968,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
encoder_sys_t
*
p_sys
=
p_enc
->
p_sys
;
encoder_sys_t
*
p_sys
=
p_enc
->
p_sys
;
block_t
*
p_block
,
*
p_chain
=
NULL
;
block_t
*
p_block
,
*
p_chain
=
NULL
;
char
*
p_buffer
=
p_aout_buf
->
p_buffer
;
uint8_t
*
p_buffer
=
p_aout_buf
->
p_buffer
;
int
i_samples
=
p_aout_buf
->
i_nb_samples
;
int
i_samples
=
p_aout_buf
->
i_nb_samples
;
int
i_samples_delay
=
p_sys
->
i_samples_delay
;
int
i_samples_delay
=
p_sys
->
i_samples_delay
;
...
@@ -1001,7 +1001,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
...
@@ -1001,7 +1001,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
p_samples
=
(
int16_t
*
)
p_buffer
;
p_samples
=
(
int16_t
*
)
p_buffer
;
}
}
i_out
=
avcodec_encode_audio
(
p_sys
->
p_context
,
p_sys
->
p_buffer_out
,
i_out
=
avcodec_encode_audio
(
p_sys
->
p_context
,
(
uint8_t
*
)
p_sys
->
p_buffer_out
,
2
*
AVCODEC_MAX_AUDIO_FRAME_SIZE
,
2
*
AVCODEC_MAX_AUDIO_FRAME_SIZE
,
p_samples
);
p_samples
);
...
...
modules/codec/ffmpeg/video.c
View file @
f407de16
...
@@ -517,7 +517,7 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
...
@@ -517,7 +517,7 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
i_used
=
avcodec_decode_video
(
p_sys
->
p_context
,
p_sys
->
p_ff_pic
,
i_used
=
avcodec_decode_video
(
p_sys
->
p_context
,
p_sys
->
p_ff_pic
,
&
b_gotpicture
,
&
b_gotpicture
,
p_sys
->
p_buffer
,
p_sys
->
i_buffer
);
(
uint8_t
*
)
p_sys
->
p_buffer
,
p_sys
->
i_buffer
);
if
(
b_null_size
&&
p_sys
->
p_context
->
width
>
0
&&
if
(
b_null_size
&&
p_sys
->
p_context
->
width
>
0
&&
p_sys
->
p_context
->
height
>
0
)
p_sys
->
p_context
->
height
>
0
)
{
{
...
@@ -526,7 +526,7 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
...
@@ -526,7 +526,7 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
p_sys
->
p_context
->
hurry_up
=
0
;
p_sys
->
p_context
->
hurry_up
=
0
;
i_used
=
avcodec_decode_video
(
p_sys
->
p_context
,
p_sys
->
p_ff_pic
,
i_used
=
avcodec_decode_video
(
p_sys
->
p_context
,
p_sys
->
p_ff_pic
,
&
b_gotpicture
,
&
b_gotpicture
,
p_sys
->
p_buffer
,
p_sys
->
i_buffer
);
(
uint8_t
*
)
p_sys
->
p_buffer
,
p_sys
->
i_buffer
);
}
}
if
(
i_used
<
0
)
if
(
i_used
<
0
)
...
@@ -725,7 +725,7 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
...
@@ -725,7 +725,7 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
/* Now remove all atoms before the SMI one */
/* Now remove all atoms before the SMI one */
if
(
p_sys
->
p_context
->
extradata_size
>
0x5a
&&
if
(
p_sys
->
p_context
->
extradata_size
>
0x5a
&&
strncmp
(
&
p
[
0x56
],
"SMI "
,
4
)
)
strncmp
(
(
char
*
)
&
p
[
0x56
],
"SMI "
,
4
)
)
{
{
uint8_t
*
psz
=
&
p
[
0x52
];
uint8_t
*
psz
=
&
p
[
0x52
];
...
@@ -737,7 +737,7 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
...
@@ -737,7 +737,7 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
/* FIXME handle 1 as long size */
/* FIXME handle 1 as long size */
break
;
break
;
}
}
if
(
!
strncmp
(
&
psz
[
4
],
"SMI "
,
4
)
)
if
(
!
strncmp
(
(
char
*
)
&
psz
[
4
],
"SMI "
,
4
)
)
{
{
memmove
(
&
p
[
0x52
],
psz
,
memmove
(
&
p
[
0x52
],
psz
,
&
p
[
p_sys
->
p_context
->
extradata_size
]
-
psz
);
&
p
[
p_sys
->
p_context
->
extradata_size
]
-
psz
);
...
...
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