RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move #defines that are mostly used in h264.c out of h264data.h and into h264.h. 

Originally committed as revision 15927 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2008-11-24 16:08:21 +00:00
parent ee2a957fbd
commit ce9ff9cc52
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264.h
View File

@ -92,6 +92,11 @@
#define EXTENDED_SAR 255
#define MB_TYPE_REF0 MB_TYPE_ACPRED //dirty but it fits in 16 bit
#define MB_TYPE_8x8DCT 0x01000000
#define IS_REF0(a) ((a) & MB_TYPE_REF0)
#define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT)
/* NAL unit types */
enum {
NAL_SLICE=1,

7
libavcodec/h264data.h
View File

@ -32,6 +32,7 @@
#include <stdint.h>
#include "libavutil/rational.h"
#include "mpegvideo.h"
#include "h264.h"
static const AVRational pixel_aspect[17]={
@ -362,12 +363,6 @@ static const uint8_t field_scan8x8_cavlc[64]={
6+3*8, 6+5*8, 7+3*8, 7+7*8,
};
#define MB_TYPE_REF0 MB_TYPE_ACPRED //dirty but it fits in 16bit
#define MB_TYPE_8x8DCT 0x01000000
#define IS_REF0(a) ((a)&MB_TYPE_REF0)
#define IS_8x8DCT(a) ((a)&MB_TYPE_8x8DCT)
typedef struct IMbInfo{
uint16_t type;
uint8_t pred_mode;