Merge commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72'

[ffmpeg] / cmdutils.h

diff --git a/cmdutils.h b/cmdutils.h
index 63e10f30380b25c4e1aba7b652a4da8a5b8dcafb..8a5dada7f76010d8d9da9942280300b77021da2c 100644 (file)
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -90,6 +90,8 @@ int opt_cpuflags(void *optctx, const char *opt, const char *arg);
 
 int opt_codec_debug(void *optctx, const char *opt, const char *arg);
 
+int opt_opencl(void *optctx, const char *opt, const char *arg);
+
 /**
  * Limit the execution time.
  */
@@ -524,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)