eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
21a928d07c25c552765fcdbe320c1adeadbef5b8
ffmpeg/cmdutils.c
Michael Niedermayer f955fdc7c6 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>
2011-11-01 02:02:20 +01:00

34 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink