apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-05-03 21:08:01 +08:00
Code Issues 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
libavcodec/h264_cabac.c
+1
View File
@@ -27,6 +27,7 @@
#define CABAC(h) 1
#define UNCHECKED_BITSTREAM_READER 1
#define INT_BIT (CHAR_BIT * sizeof(int))
#include "libavutil/attributes.h"
#include "libavutil/avassert.h"