| @@ -122,12 +122,6 @@ static char *ts_value_string (char *buf, int buf_size, int64_t ts) | |||||
| return buf; | 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 { | struct writer { | ||||
| const char *name; | const char *name; | ||||
| @@ -315,7 +309,7 @@ static void show_packet(struct writer *w, AVFormatContext *fmt_ctx, AVPacket *pk | |||||
| if (packet_idx) | if (packet_idx) | ||||
| printf("%s", w->items_sep); | printf("%s", w->items_sep); | ||||
| w->print_header("PACKET"); | 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_int("stream_index", pkt->stream_index); | ||||
| print_str("pts", ts_value_string (val_str, sizeof(val_str), pkt->pts)); | 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)); | 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_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_fmt("codec_time_base", "%d/%d", dec_ctx->time_base.num, dec_ctx->time_base.den); | ||||
| /* print AVI/FourCC tag */ | /* print AVI/FourCC tag */ | ||||