highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'

Browse Source 
* commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2':
  lavu: move internal define to the only places where it is used

Conflicts:
	libavcodec/h264_cabac.c
	libavutil/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-24 12:45:07 +01:00
parent 010adacbe2 277ff7f5dc
commit 932d8d790c
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/internal.h
View File

@@ -80,9 +80,6 @@
# define FF_ENABLE_DEPRECATION_WARNINGS
#endif
#ifndef INT_BIT
# define INT_BIT (CHAR_BIT * sizeof(int))
#endif
#define FF_MEMORY_POISON 0x2a