Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 May 2011 02:06:26 +0000 (04:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 May 2011 02:06:26 +0000 (04:06 +0200)
* qatar/master:
  Implement fate-rsync target
  Make ffmpeg support generic data stream

Conflicts:
cmdutils.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
Makefile
cmdutils.h
ffmpeg.c
libavformat/riff.c

diff --cc Makefile
Simple merge
diff --cc cmdutils.h
@@@ -122,7 -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;
diff --cc ffmpeg.c
Simple merge
Simple merge