diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:56:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:56:20 +0200 |
| commit | 608d86013a8663ef5f2fc8c74998750ed2019149 (patch) | |
| tree | f46ec16c3756c6775c64cfd53fc821f1fc21143b /cmdutils.h | |
| parent | 3dedcef8b889c07f700f6f5d5632a120eb46f593 (diff) | |
| parent | e19e8aeeaaff3d4bc8f6065764c93f0298782ac6 (diff) | |
| download | ffmpeg-608d86013a8663ef5f2fc8c74998750ed2019149.tar.gz | |
Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'
* commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6':
avtools: move media_type_string() from avprobe to cmdutils.
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmdutils.h b/cmdutils.h index 57a62b0067..8a5dada7f7 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -526,6 +526,8 @@ FILE *get_preset_file(char *filename, size_t filename_size, */ void *grow_array(void *array, int elem_size, int *size, int new_size); +#define media_type_string av_get_media_type_string + #define GROW_ARRAY(array, nb_elems)\ array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1) |