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
bec96a72
Commit
bec96a72
authored
Mar 27, 2017
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: use av_fourcc2str() where appropriate
parent
d3cedc54
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
23 additions
and
35 deletions
+23
-35
avidec.c
libavformat/avidec.c
+3
-7
cafdec.c
libavformat/cafdec.c
+2
-4
dxa.c
libavformat/dxa.c
+4
-2
iff.c
libavformat/iff.c
+2
-2
mlvdec.c
libavformat/mlvdec.c
+2
-1
mov.c
libavformat/mov.c
+2
-3
rmdec.c
libavformat/rmdec.c
+2
-7
wc3movie.c
libavformat/wc3movie.c
+4
-6
westwood_vqa.c
libavformat/westwood_vqa.c
+2
-3
No files found.
libavformat/avidec.c
View file @
bec96a72
...
...
@@ -117,13 +117,9 @@ static const AVMetadataConv avi_metadata_conv[] = {
static
int
avi_load_index
(
AVFormatContext
*
s
);
static
int
guess_ni_flag
(
AVFormatContext
*
s
);
#define print_tag(str, tag, size) \
av_log(NULL, AV_LOG_TRACE, "pos:%"PRIX64" %s: tag=%c%c%c%c size=0x%x\n", \
avio_tell(pb), str, tag & 0xff, \
(tag >> 8) & 0xff, \
(tag >> 16) & 0xff, \
(tag >> 24) & 0xff, \
size)
#define print_tag(str, tag, size) \
av_log(NULL, AV_LOG_TRACE, "pos:%"PRIX64" %s: tag=%s size=0x%x\n", \
avio_tell(pb), str, av_fourcc2str(tag), size) \
static
inline
int
get_duration
(
AVIStream
*
ast
,
int
len
)
{
...
...
libavformat/cafdec.c
View file @
bec96a72
...
...
@@ -298,11 +298,9 @@ static int read_header(AVFormatContext *s)
break
;
default:
#define _(x) ((x) >= ' ' ? (x) : ' ')
av_log
(
s
,
AV_LOG_WARNING
,
"skipping CAF chunk: %08"
PRIX32
" (%c%c%c%c), size %"
PRId64
"
\n
"
,
tag
,
_
(
tag
>>
24
),
_
((
tag
>>
16
)
&
0xFF
),
_
((
tag
>>
8
)
&
0xFF
),
_
(
tag
&
0xFF
),
size
);
#undef _
"skipping CAF chunk: %08"
PRIX32
" (%s), size %"
PRId64
"
\n
"
,
tag
,
av_fourcc2str
(
av_bswap32
(
tag
)),
size
);
case
MKBETAG
(
'f'
,
'r'
,
'e'
,
'e'
):
if
(
size
<
0
)
return
AVERROR_INVALIDDATA
;
...
...
libavformat/dxa.c
View file @
bec96a72
...
...
@@ -171,11 +171,13 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
}
avio_seek
(
s
->
pb
,
c
->
vidpos
,
SEEK_SET
);
while
(
!
avio_feof
(
s
->
pb
)
&&
c
->
frames
){
uint32_t
tag
;
if
((
ret
=
avio_read
(
s
->
pb
,
buf
,
4
))
!=
4
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"failed reading chunk type
\n
"
);
return
ret
<
0
?
ret
:
AVERROR_INVALIDDATA
;
}
switch
(
AV_RL32
(
buf
)){
tag
=
AV_RL32
(
buf
);
switch
(
tag
)
{
case
MKTAG
(
'N'
,
'U'
,
'L'
,
'L'
):
if
(
av_new_packet
(
pkt
,
4
+
pal_size
)
<
0
)
return
AVERROR
(
ENOMEM
);
...
...
@@ -217,7 +219,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
c
->
readvid
=
0
;
return
0
;
default:
av_log
(
s
,
AV_LOG_ERROR
,
"Unknown tag %
c%c%c%c
\n
"
,
buf
[
0
],
buf
[
1
],
buf
[
2
],
buf
[
3
]
);
av_log
(
s
,
AV_LOG_ERROR
,
"Unknown tag %
s
\n
"
,
av_fourcc2str
(
tag
)
);
return
AVERROR_INVALIDDATA
;
}
}
...
...
libavformat/iff.c
View file @
bec96a72
...
...
@@ -296,8 +296,8 @@ static int parse_dsd_prop(AVFormatContext *s, AVStream *st, uint64_t eof)
st
->
codecpar
->
codec_tag
=
tag
=
avio_rl32
(
pb
);
st
->
codecpar
->
codec_id
=
ff_codec_get_id
(
dsd_codec_tags
,
tag
);
if
(
!
st
->
codecpar
->
codec_id
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"'%
c%c%c%c
' compression is not supported
\n
"
,
tag
&
0xFF
,
(
tag
>>
8
)
&
0xFF
,
(
tag
>>
16
)
&
0xFF
,
(
tag
>>
24
)
&
0xFF
);
av_log
(
s
,
AV_LOG_ERROR
,
"'%
s
' compression is not supported
\n
"
,
av_fourcc2str
(
tag
)
);
return
AVERROR_PATCHWELCOME
;
}
break
;
...
...
libavformat/mlvdec.c
View file @
bec96a72
...
...
@@ -242,7 +242,8 @@ static int scan_file(AVFormatContext *avctx, AVStream *vst, AVStream *ast, int f
}
else
if
(
type
==
MKTAG
(
'N'
,
'U'
,
'L'
,
'L'
))
{
}
else
if
(
type
==
MKTAG
(
'M'
,
'L'
,
'V'
,
'I'
))
{
/* occurs when MLV and Mnn files are concatenated */
}
else
{
av_log
(
avctx
,
AV_LOG_INFO
,
"unsupported tag %c%c%c%c, size %u
\n
"
,
type
&
0xFF
,
(
type
>>
8
)
&
0xFF
,
(
type
>>
16
)
&
0xFF
,
(
type
>>
24
)
&
0xFF
,
size
);
av_log
(
avctx
,
AV_LOG_INFO
,
"unsupported tag %s, size %u
\n
"
,
av_fourcc2str
(
type
),
size
);
}
avio_skip
(
pb
,
size
);
}
...
...
libavformat/mov.c
View file @
bec96a72
...
...
@@ -2284,9 +2284,8 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
id
=
mov_codec_id
(
st
,
format
);
av_log
(
c
->
fc
,
AV_LOG_TRACE
,
"size=%"
PRId64
" 4CC= %c%c%c%c/0x%08x codec_type=%d
\n
"
,
size
,
(
format
>>
0
)
&
0xff
,
(
format
>>
8
)
&
0xff
,
(
format
>>
16
)
&
0xff
,
(
format
>>
24
)
&
0xff
,
format
,
st
->
codecpar
->
codec_type
);
"size=%"
PRId64
" 4CC=%s/0x%08x codec_type=%d
\n
"
,
size
,
av_fourcc2str
(
format
),
format
,
st
->
codecpar
->
codec_type
);
if
(
st
->
codecpar
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
{
st
->
codecpar
->
codec_id
=
id
;
...
...
libavformat/rmdec.c
View file @
bec96a72
...
...
@@ -564,13 +564,8 @@ static int rm_read_header(AVFormatContext *s)
tag
=
avio_rl32
(
pb
);
tag_size
=
avio_rb32
(
pb
);
avio_rb16
(
pb
);
av_log
(
s
,
AV_LOG_TRACE
,
"tag=%c%c%c%c (%08x) size=%d
\n
"
,
(
tag
)
&
0xff
,
(
tag
>>
8
)
&
0xff
,
(
tag
>>
16
)
&
0xff
,
(
tag
>>
24
)
&
0xff
,
tag
,
tag_size
);
av_log
(
s
,
AV_LOG_TRACE
,
"tag=%s size=%d
\n
"
,
av_fourcc2str
(
tag
),
tag_size
);
if
(
tag_size
<
10
&&
tag
!=
MKTAG
(
'D'
,
'A'
,
'T'
,
'A'
))
goto
fail
;
switch
(
tag
)
{
...
...
libavformat/wc3movie.c
View file @
bec96a72
...
...
@@ -150,9 +150,8 @@ static int wc3_read_header(AVFormatContext *s)
break
;
default:
av_log
(
s
,
AV_LOG_ERROR
,
" unrecognized WC3 chunk: %c%c%c%c (0x%02X%02X%02X%02X)
\n
"
,
(
uint8_t
)
fourcc_tag
,
(
uint8_t
)(
fourcc_tag
>>
8
),
(
uint8_t
)(
fourcc_tag
>>
16
),
(
uint8_t
)(
fourcc_tag
>>
24
),
(
uint8_t
)
fourcc_tag
,
(
uint8_t
)(
fourcc_tag
>>
8
),
(
uint8_t
)(
fourcc_tag
>>
16
),
(
uint8_t
)(
fourcc_tag
>>
24
));
av_log
(
s
,
AV_LOG_ERROR
,
"unrecognized WC3 chunk: %s
\n
"
,
av_fourcc2str
(
fourcc_tag
));
return
AVERROR_INVALIDDATA
;
}
...
...
@@ -274,9 +273,8 @@ static int wc3_read_packet(AVFormatContext *s,
break
;
default:
av_log
(
s
,
AV_LOG_ERROR
,
" unrecognized WC3 chunk: %c%c%c%c (0x%02X%02X%02X%02X)
\n
"
,
(
uint8_t
)
fourcc_tag
,
(
uint8_t
)(
fourcc_tag
>>
8
),
(
uint8_t
)(
fourcc_tag
>>
16
),
(
uint8_t
)(
fourcc_tag
>>
24
),
(
uint8_t
)
fourcc_tag
,
(
uint8_t
)(
fourcc_tag
>>
8
),
(
uint8_t
)(
fourcc_tag
>>
16
),
(
uint8_t
)(
fourcc_tag
>>
24
));
av_log
(
s
,
AV_LOG_ERROR
,
"unrecognized WC3 chunk: %s
\n
"
,
av_fourcc2str
(
fourcc_tag
));
ret
=
AVERROR_INVALIDDATA
;
packet_read
=
1
;
break
;
...
...
libavformat/westwood_vqa.c
View file @
bec96a72
...
...
@@ -144,9 +144,8 @@ static int wsvqa_read_header(AVFormatContext *s)
break
;
default:
av_log
(
s
,
AV_LOG_ERROR
,
" note: unknown chunk seen (%c%c%c%c)
\n
"
,
scratch
[
0
],
scratch
[
1
],
scratch
[
2
],
scratch
[
3
]);
av_log
(
s
,
AV_LOG_ERROR
,
" note: unknown chunk seen (%s)
\n
"
,
av_fourcc2str
(
chunk_tag
));
break
;
}
...
...
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