Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
03d0ea0c
Commit
03d0ea0c
authored
Sep 16, 2011
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffprobe: remove media_type_string() by inlining av_x_if_null().
parent
a70e7874
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
ffprobe.c
ffprobe.c
+2
-8
No files found.
ffprobe.c
View file @
03d0ea0c
...
...
@@ -122,12 +122,6 @@ static char *ts_value_string (char *buf, int buf_size, int64_t ts)
return
buf
;
}
static
const
char
*
media_type_string
(
enum
AVMediaType
media_type
)
{
const
char
*
s
=
av_get_media_type_string
(
media_type
);
return
s
?
s
:
"unknown"
;
}
struct
writer
{
const
char
*
name
;
...
...
@@ -315,7 +309,7 @@ static void show_packet(struct writer *w, AVFormatContext *fmt_ctx, AVPacket *pk
if
(
packet_idx
)
printf
(
"%s"
,
w
->
items_sep
);
w
->
print_header
(
"PACKET"
);
print_str0
(
"codec_type"
,
media_type_string
(
st
->
codec
->
codec_type
));
print_str0
(
"codec_type"
,
av_x_if_null
(
av_get_media_type_string
(
st
->
codec
->
codec_type
),
"unknown"
));
print_int
(
"stream_index"
,
pkt
->
stream_index
);
print_str
(
"pts"
,
ts_value_string
(
val_str
,
sizeof
(
val_str
),
pkt
->
pts
));
print_str
(
"pts_time"
,
time_value_string
(
val_str
,
sizeof
(
val_str
),
pkt
->
pts
,
&
st
->
time_base
));
...
...
@@ -397,7 +391,7 @@ static void show_stream(struct writer *w, AVFormatContext *fmt_ctx, int stream_i
print_str
(
"codec_name"
,
"unknown"
);
}
print_str
(
"codec_type"
,
media_type_string
(
dec_ctx
->
codec_type
));
print_str
(
"codec_type"
,
av_x_if_null
(
av_get_media_type_string
(
dec_ctx
->
codec_type
),
"unknown"
));
print_fmt
(
"codec_time_base"
,
"%d/%d"
,
dec_ctx
->
time_base
.
num
,
dec_ctx
->
time_base
.
den
);
/* print AVI/FourCC tag */
...
...
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