Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
sixue.cheng
FFmpeg
Commits
8b471461
Commit
8b471461
authored
10 years ago
by
Michael Niedermayer
Browse files
Options
Download
Email Patches
Plain Diff
avformat/img2_alias & brender_pix: fix function names
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
646d663f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavformat/img2_alias_pix.c
+2
-2
libavformat/img2_alias_pix.c
libavformat/img2_brender_pix.c
+2
-2
libavformat/img2_brender_pix.c
with
4 additions
and
4 deletions
+4
-4
libavformat/img2_alias_pix.c
+
2
-
2
View file @
8b471461
...
...
@@ -22,7 +22,7 @@
#include "img2.h"
#include "libavcodec/bytestream.h"
static
int
brender
_read_probe
(
AVProbeData
*
p
)
static
int
alias_pix
_read_probe
(
AVProbeData
*
p
)
{
const
uint8_t
*
b
=
p
->
buf
;
const
uint8_t
*
end
=
b
+
p
->
buf_size
;
...
...
@@ -58,7 +58,7 @@ AVInputFormat ff_image2_alias_pix_demuxer = {
.
name
=
"alias_pix"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Alias/Wavefront PIX image"
),
.
priv_data_size
=
sizeof
(
VideoDemuxData
),
.
read_probe
=
brender
_read_probe
,
.
read_probe
=
alias_pix
_read_probe
,
.
read_header
=
ff_img_read_header
,
.
read_packet
=
ff_img_read_packet
,
.
raw_codec_id
=
AV_CODEC_ID_ALIAS_PIX
,
...
...
This diff is collapsed.
Click to expand it.
libavformat/img2_brender_pix.c
+
2
-
2
View file @
8b471461
...
...
@@ -22,7 +22,7 @@
#include "img2.h"
#include "libavutil/intreadwrite.h"
static
int
aliaspix
_read_probe
(
AVProbeData
*
p
)
static
int
brender
_read_probe
(
AVProbeData
*
p
)
{
static
const
uint8_t
brender_magic
[
16
]
=
{
0
,
0
,
0
,
0x12
,
0
,
0
,
0
,
8
,
0
,
0
,
0
,
2
,
0
,
0
,
0
,
2
...
...
@@ -49,7 +49,7 @@ AVInputFormat ff_image2_brender_pix_demuxer = {
.
name
=
"brender_pix"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"BRender PIX image"
),
.
priv_data_size
=
sizeof
(
VideoDemuxData
),
.
read_probe
=
aliaspix
_read_probe
,
.
read_probe
=
brender
_read_probe
,
.
read_header
=
ff_img_read_header
,
.
read_packet
=
ff_img_read_packet
,
.
raw_codec_id
=
AV_CODEC_ID_BRENDER_PIX
,
...
...
This diff is collapsed.
Click to expand it.
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