Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
800d91d3
Commit
800d91d3
authored
Oct 30, 2015
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop pointless void* casts
parent
d316f9ce
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
7 deletions
+6
-7
flac_parser.c
libavcodec/flac_parser.c
+1
-1
libopenh264enc.c
libavcodec/libopenh264enc.c
+2
-2
libschroedinger.c
libavcodec/libschroedinger.c
+1
-1
vdpau.c
libavcodec/vdpau.c
+1
-1
avisynth.c
libavformat/avisynth.c
+1
-2
No files found.
libavcodec/flac_parser.c
View file @
800d91d3
...
@@ -588,7 +588,7 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
...
@@ -588,7 +588,7 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
read_end
-
read_start
,
NULL
);
read_end
-
read_start
,
NULL
);
}
else
{
}
else
{
int8_t
pad
[
MAX_FRAME_HEADER_SIZE
]
=
{
0
};
int8_t
pad
[
MAX_FRAME_HEADER_SIZE
]
=
{
0
};
av_fifo_generic_write
(
fpc
->
fifo_buf
,
(
void
*
)
pad
,
sizeof
(
pad
),
NULL
);
av_fifo_generic_write
(
fpc
->
fifo_buf
,
pad
,
sizeof
(
pad
),
NULL
);
}
}
/* Tag headers and update sequences. */
/* Tag headers and update sequences. */
...
...
libavcodec/libopenh264enc.c
View file @
800d91d3
...
@@ -112,10 +112,10 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
...
@@ -112,10 +112,10 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
// Set the logging callback function to one that uses av_log() (see implementation above).
// Set the logging callback function to one that uses av_log() (see implementation above).
callback_function
=
(
WelsTraceCallback
)
ff_libopenh264_trace_callback
;
callback_function
=
(
WelsTraceCallback
)
ff_libopenh264_trace_callback
;
(
*
s
->
encoder
)
->
SetOption
(
s
->
encoder
,
ENCODER_OPTION_TRACE_CALLBACK
,
(
void
*
)
&
callback_function
);
(
*
s
->
encoder
)
->
SetOption
(
s
->
encoder
,
ENCODER_OPTION_TRACE_CALLBACK
,
&
callback_function
);
// Set the AVCodecContext as the libopenh264 callback context so that it can be passed to av_log().
// Set the AVCodecContext as the libopenh264 callback context so that it can be passed to av_log().
(
*
s
->
encoder
)
->
SetOption
(
s
->
encoder
,
ENCODER_OPTION_TRACE_CALLBACK_CONTEXT
,
(
void
*
)
&
avctx
);
(
*
s
->
encoder
)
->
SetOption
(
s
->
encoder
,
ENCODER_OPTION_TRACE_CALLBACK_CONTEXT
,
&
avctx
);
(
*
s
->
encoder
)
->
GetDefaultParams
(
s
->
encoder
,
&
param
);
(
*
s
->
encoder
)
->
GetDefaultParams
(
s
->
encoder
,
&
param
);
...
...
libavcodec/libschroedinger.c
View file @
800d91d3
...
@@ -200,7 +200,7 @@ SchroFrame *ff_create_schro_frame(AVCodecContext *avctx,
...
@@ -200,7 +200,7 @@ SchroFrame *ff_create_schro_frame(AVCodecContext *avctx,
p_frame
->
format
=
schro_frame_fmt
;
p_frame
->
format
=
schro_frame_fmt
;
p_frame
->
width
=
y_width
;
p_frame
->
width
=
y_width
;
p_frame
->
height
=
y_height
;
p_frame
->
height
=
y_height
;
schro_frame_set_free_callback
(
p_frame
,
free_schro_frame
,
(
void
*
)
p_pic
);
schro_frame_set_free_callback
(
p_frame
,
free_schro_frame
,
p_pic
);
for
(
i
=
0
;
i
<
3
;
++
i
)
{
for
(
i
=
0
;
i
<
3
;
++
i
)
{
p_frame
->
components
[
i
].
width
=
i
?
uv_width
:
y_width
;
p_frame
->
components
[
i
].
width
=
i
?
uv_width
:
y_width
;
...
...
libavcodec/vdpau.c
View file @
800d91d3
...
@@ -267,7 +267,7 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
...
@@ -267,7 +267,7 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
if
(
val
<
0
)
if
(
val
<
0
)
return
val
;
return
val
;
status
=
vdctx
->
render
(
vdctx
->
decoder
,
surf
,
(
void
*
)
&
pic_ctx
->
info
,
status
=
vdctx
->
render
(
vdctx
->
decoder
,
surf
,
&
pic_ctx
->
info
,
pic_ctx
->
bitstream_buffers_used
,
pic_ctx
->
bitstream_buffers_used
,
pic_ctx
->
bitstream_buffers
);
pic_ctx
->
bitstream_buffers
);
...
...
libavformat/avisynth.c
View file @
800d91d3
...
@@ -118,8 +118,7 @@ static av_cold int avisynth_load_library(void)
...
@@ -118,8 +118,7 @@ static av_cold int avisynth_load_library(void)
return
AVERROR_UNKNOWN
;
return
AVERROR_UNKNOWN
;
#define LOAD_AVS_FUNC(name, continue_on_fail) \
#define LOAD_AVS_FUNC(name, continue_on_fail) \
avs_library.name = \
avs_library.name = GetProcAddress(avs_library.library, #name); \
(void *)GetProcAddress(avs_library.library, #name); \
if (!continue_on_fail && !avs_library.name) \
if (!continue_on_fail && !avs_library.name) \
goto fail;
goto fail;
...
...
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