Changeset f955fdc7 in ffmpeg

Timestamp:

Nov 1, 2011, 1:02:20 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0c339897

Parents:

3e5ea9e4 (diff), 02170990 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)