Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Nov 2011 01:02:20 +0000 (02:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Nov 2011 01:02:20 +0000 (02:02 +0100)
commitf955fdc7c6a8c651c9e67fb1f79d3f0b2f72df11
treec82845c58f791e8f021a8c785d0a4d1a12eec3e7
parent3e5ea9e471d8f08bfa0c6aa86241393a3d08066a
parent02170990fdb2a05c6eaf5fd449f440ec51c0f822
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: Rename read_file to cmdutils_read_file

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avconv.c
cmdutils.c
cmdutils.h
ffmpeg.c