[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  1 02:02:20 2011 +0100| [f955fdc7c6a8c651c9e67fb1f79d3f0b2f72df11] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: Rename read_file to cmdutils_read_file

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f955fdc7c6a8c651c9e67fb1f79d3f0b2f72df11
---