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>

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;