eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-22 23:10:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
5b41bb29d73eaff18f7fd8e7efe78ec82578f5d0
ffmpeg/libavcodec/dirac_parser.c
Michael Niedermayer b63052839a Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06' 
* commit '9752d07d33d5370f7819865fbb5e582b982aad06':
  dirac: K&R formatting cosmetics

Conflicts:
	libavcodec/dirac.c
	libavcodec/dirac_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 12:12:29 +02:00

8.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink