eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qatar/master'

Browse source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-12-30 11:23:32 +01:00
commit 8ccc58bb7d
5 changed files with 58 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavutil/utils.c
View file

@ -17,7 +17,7 @@
*/
#include "config.h"
#include "version.h"
#include "avutil.h"
#include "avassert.h"
#include "samplefmt.h"
#include "pixdesc.h"