avtools: move media_type_string() from avprobe to cmdutils.

It will be useful outside of avprobe.
pull/21/head
Anton Khirnov 12 years ago
parent dc574658d1
commit e19e8aeeaa
  1. 14
      avprobe.c
  2. 12
      cmdutils.c
  3. 5
      cmdutils.h

@ -526,20 +526,6 @@ static char *tag_string(char *buf, int buf_size, int tag)
return buf; return buf;
} }
static const char *media_type_string(enum AVMediaType media_type)
{
switch (media_type) {
case AVMEDIA_TYPE_VIDEO: return "video";
case AVMEDIA_TYPE_AUDIO: return "audio";
case AVMEDIA_TYPE_DATA: return "data";
case AVMEDIA_TYPE_SUBTITLE: return "subtitle";
case AVMEDIA_TYPE_ATTACHMENT: return "attachment";
default: return "unknown";
}
}
static void show_packet(AVFormatContext *fmt_ctx, AVPacket *pkt) static void show_packet(AVFormatContext *fmt_ctx, AVPacket *pkt)
{ {
char val_str[128]; char val_str[128];

@ -1553,3 +1553,15 @@ void *grow_array(void *array, int elem_size, int *size, int new_size)
} }
return array; return array;
} }
const char *media_type_string(enum AVMediaType media_type)
{
switch (media_type) {
case AVMEDIA_TYPE_VIDEO: return "video";
case AVMEDIA_TYPE_AUDIO: return "audio";
case AVMEDIA_TYPE_DATA: return "data";
case AVMEDIA_TYPE_SUBTITLE: return "subtitle";
case AVMEDIA_TYPE_ATTACHMENT: return "attachment";
default: return "unknown";
}
}

@ -514,6 +514,11 @@ FILE *get_preset_file(char *filename, size_t filename_size,
*/ */
void *grow_array(void *array, int elem_size, int *size, int new_size); void *grow_array(void *array, int elem_size, int *size, int new_size);
/**
* Get a string describing a media type.
*/
const char *media_type_string(enum AVMediaType media_type);
#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)

Loading…
Cancel
Save