diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-04 04:06:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-04 04:06:26 +0200 |
| commit | 707e8612e85ba83fcbbfc56be3f4ab24af7e98fb (patch) | |
| tree | 63a0dec27eaca16ab40ea8d6a888bbf97662151e /cmdutils.h | |
| parent | b5f20892c960ab9058c74703b29d7bf9d248bd36 (diff) | |
| parent | 8ce67bcabe7f50622430c11c3384675f095c78b5 (diff) | |
| download | ffmpeg-707e8612e85ba83fcbbfc56be3f4ab24af7e98fb.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Implement fate-rsync target
Make ffmpeg support generic data stream
Conflicts:
cmdutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmdutils.h b/cmdutils.h index db84f55f30..d460200f4e 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -122,7 +122,8 @@ typedef struct { #define OPT_FUNC2 0x0400 #define OPT_INT64 0x0800 #define OPT_EXIT 0x1000 -#define OPT_DUMMY 0x2000 +#define OPT_DATA 0x2000 +#define OPT_DUMMY 0x4000 union { void (*func_arg)(const char *); //FIXME passing error code as int return would be nicer then exit() in the func int *int_arg; |