diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-03-28 09:10:09 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-04-11 20:46:04 +0200 |
commit | e19e8aeeaaff3d4bc8f6065764c93f0298782ac6 (patch) | |
tree | 4acf3225ce2695ff1465b933ff305a07613ef3f4 | |
parent | dc574658d15ad8f171dbdecbdce7197acf9424a0 (diff) | |
download | ffmpeg-e19e8aeeaaff3d4bc8f6065764c93f0298782ac6.tar.gz |
avtools: move media_type_string() from avprobe to cmdutils.
It will be useful outside of avprobe.
-rw-r--r-- | avprobe.c | 14 | ||||
-rw-r--r-- | cmdutils.c | 12 | ||||
-rw-r--r-- | cmdutils.h | 5 |
3 files changed, 17 insertions, 14 deletions
@@ -526,20 +526,6 @@ static char *tag_string(char *buf, int buf_size, int tag) 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) { char val_str[128]; diff --git a/cmdutils.c b/cmdutils.c index 7084faed41..f43f70120a 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1553,3 +1553,15 @@ void *grow_array(void *array, int elem_size, int *size, int new_size) } 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"; + } +} diff --git a/cmdutils.h b/cmdutils.h index 1ae1978ab2..2372b3f387 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -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); +/** + * Get a string describing a media type. + */ +const char *media_type_string(enum AVMediaType media_type); + #define GROW_ARRAY(array, nb_elems)\ array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1) |