starred/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-24 07:31:22 +01:00
Code Issues 5 Projects Packages Wiki Activity Actions

Merge commit '277ff7f5dc'

Browse source 
* commit '277ff7f5dc':
  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
commit 932d8d790c
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libavcodec/h263.h
View file

@ -29,6 +29,7 @@
#if !FF_API_ASPECT_EXTENDED
#define FF_ASPECT_EXTENDED 15
#endif
#define INT_BIT (CHAR_BIT * sizeof(int))
// The defines below define the number of bits that are read at once for
// reading vlc values. Changing these may improve speed and data cache needs

1
libavcodec/h264_cabac.c
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"

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