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)
commit707e8612e85ba83fcbbfc56be3f4ab24af7e98fb
tree63a0dec27eaca16ab40ea8d6a888bbf97662151e
parentb5f20892c960ab9058c74703b29d7bf9d248bd36
parent8ce67bcabe7f50622430c11c3384675f095c78b5
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>
Makefile
cmdutils.h
ffmpeg.c
libavformat/riff.c