RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools: drop useless indirection

This commit is contained in:
Anton Khirnov 2022-03-09 11:09:30 +01:00
parent 5e51f5af33
commit c99b93c5d5
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/cmdutils.c
View File

@ -1980,7 +1980,7 @@ static void show_help_filter(const char *name)
count = avfilter_filter_pad_count(f, 0); count = avfilter_filter_pad_count(f, 0);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i), printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i),
media_type_string(avfilter_pad_get_type(f->inputs, i))); av_get_media_type_string(avfilter_pad_get_type(f->inputs, i)));
} }
if (f->flags & AVFILTER_FLAG_DYNAMIC_INPUTS) if (f->flags & AVFILTER_FLAG_DYNAMIC_INPUTS)
printf(" dynamic (depending on the options)\n"); printf(" dynamic (depending on the options)\n");
@ -1991,7 +1991,7 @@ static void show_help_filter(const char *name)
count = avfilter_filter_pad_count(f, 1); count = avfilter_filter_pad_count(f, 1);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i), printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i),
media_type_string(avfilter_pad_get_type(f->outputs, i))); av_get_media_type_string(avfilter_pad_get_type(f->outputs, i)));
} }
if (f->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS) if (f->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS)
printf(" dynamic (depending on the options)\n"); printf(" dynamic (depending on the options)\n");

2
fftools/cmdutils.h
View File

@ -633,8 +633,6 @@ void *grow_array(void *array, int elem_size, int *size, int new_size);
*/ */
void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems); void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems);
#define media_type_string av_get_media_type_string
#define GROW_ARRAY(array, nb_elems)\ #define GROW_ARRAY(array, nb_elems)\
array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1) array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1)

4
fftools/ffmpeg.c
View File

@ -1608,7 +1608,7 @@ static void print_final_stats(int64_t total_size)
total_packets += ist->nb_packets; total_packets += ist->nb_packets;
av_log(NULL, AV_LOG_VERBOSE, " Input stream #%d:%d (%s): ", av_log(NULL, AV_LOG_VERBOSE, " Input stream #%d:%d (%s): ",
i, j, media_type_string(type)); i, j, av_get_media_type_string(type));
av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" packets read (%"PRIu64" bytes); ", av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" packets read (%"PRIu64" bytes); ",
ist->nb_packets, ist->data_size); ist->nb_packets, ist->data_size);
@ -1642,7 +1642,7 @@ static void print_final_stats(int64_t total_size)
total_packets += ost->packets_written; total_packets += ost->packets_written;
av_log(NULL, AV_LOG_VERBOSE, " Output stream #%d:%d (%s): ", av_log(NULL, AV_LOG_VERBOSE, " Output stream #%d:%d (%s): ",
i, j, media_type_string(type)); i, j, av_get_media_type_string(type));
if (ost->encoding_needed) { if (ost->encoding_needed) {
av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" frames encoded", av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" frames encoded",
ost->frames_encoded); ost->frames_encoded);