diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-01 02:02:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-01 02:02:20 +0100 |
| commit | f955fdc7c6a8c651c9e67fb1f79d3f0b2f72df11 (patch) | |
| tree | c82845c58f791e8f021a8c785d0a4d1a12eec3e7 /libavutil/sha.c | |
| parent | 3e5ea9e471d8f08bfa0c6aa86241393a3d08066a (diff) | |
| parent | 02170990fdb2a05c6eaf5fd449f440ec51c0f822 (diff) | |
| download | ffmpeg-f955fdc7c6a8c651c9e67fb1f79d3f0b2f72df11.tar.gz | |
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>
Diffstat (limited to 'libavutil/sha.c')
0 files changed, 0 insertions, 0 deletions