eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 12:30:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0b51d15a0e577b7b3bbc05ce1105850cf5ca7732
ffmpeg/libavutil/file.c
Michael Niedermayer 9c41b59423 Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464' 
* commit '0a024268261d05ccdcf7e03c85fb78d22037a464':
  libxvid: K&R formatting cosmetics

Conflicts:
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26 21:45:39 +02:00

5.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink