Browse code
Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'
* commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6':
avtools: move media_type_string() from avprobe to cmdutils.
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer authored on 2013/04/12 22:56:20Showing 1 changed files
| ... | ... |
@@ -526,6 +526,8 @@ FILE *get_preset_file(char *filename, size_t filename_size, |
| 526 | 526 |
*/ |
| 527 | 527 |
void *grow_array(void *array, int elem_size, int *size, int new_size); |
| 528 | 528 |
|
| 529 |
+#define media_type_string av_get_media_type_string |
|
| 530 |
+ |
|
| 529 | 531 |
#define GROW_ARRAY(array, nb_elems)\ |
| 530 | 532 |
array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1) |
| 531 | 533 |
|