1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Change NAL unit type defines to an enum and move to a header file for usage

in other code.

Originally committed as revision 7226 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Panagiotis Issaris 2006-12-05 21:52:15 +00:00
parent 3c13202396
commit 550e66cb59
2 changed files with 18 additions and 14 deletions

View File

@ -165,20 +165,6 @@ typedef struct H264Context{
MpegEncContext s; MpegEncContext s;
int nal_ref_idc; int nal_ref_idc;
int nal_unit_type; int nal_unit_type;
#define NAL_SLICE 1
#define NAL_DPA 2
#define NAL_DPB 3
#define NAL_DPC 4
#define NAL_IDR_SLICE 5
#define NAL_SEI 6
#define NAL_SPS 7
#define NAL_PPS 8
#define NAL_AUD 9
#define NAL_END_SEQUENCE 10
#define NAL_END_STREAM 11
#define NAL_FILLER_DATA 12
#define NAL_SPS_EXT 13
#define NAL_AUXILIARY_SLICE 19
uint8_t *rbsp_buffer; uint8_t *rbsp_buffer;
unsigned int rbsp_buffer_size; unsigned int rbsp_buffer_size;

View File

@ -53,6 +53,24 @@
#define EXTENDED_SAR 255 #define EXTENDED_SAR 255
/* NAL unit types */
enum {
NAL_SLICE=1,
NAL_DPA,
NAL_DPB,
NAL_DPC,
NAL_IDR_SLICE,
NAL_SEI,
NAL_SPS,
NAL_PPS,
NAL_AUD,
NAL_END_SEQUENCE,
NAL_END_STREAM,
NAL_FILLER_DATA,
NAL_SPS_EXT,
NAL_AUXILIARY_SLICE=19
};
static const AVRational pixel_aspect[14]={ static const AVRational pixel_aspect[14]={
{0, 1}, {0, 1},
{1, 1}, {1, 1},