xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-26 04:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,918 Commits 31 Branches 338 Tags 298 MiB
b9fd813351
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer
8ccc58bb7d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavu: Move preprocessor macros in a separate file

Conflicts:
	libavutil/avutil.h
	libavutil/utils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-30 11:23:32 +01:00
Luca Barbato
9a4c10e3af lavu: Move preprocessor macros in a separate file 
And remove all the circular inclusions of avutil.h while at it.
 2013-12-29 22:52:04 +01:00