From 03d0ea0cf09a95bc8dfacc18fe038d4883f93d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Fri, 16 Sep 2011 12:54:19 +0200
Subject: [PATCH] ffprobe: remove media_type_string() by inlining
av_x_if_null().
---
ffprobe.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/ffprobe.c b/ffprobe.c
index 6c677e81252..b298b603d97 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -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 */
--
GitLab