diff options
| author | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2006-12-05 21:52:15 +0000 |
|---|---|---|
| committer | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2006-12-05 21:52:15 +0000 |
| commit | 550e66cb59cf997cfae7627c5a9072147a831129 (patch) | |
| tree | 4a93ef38a62eecc89926afe804175f18d7403891 | |
| parent | 3c13202396ec110308ed62656cbbc0e540774f69 (diff) | |
| download | ffmpeg-550e66cb59cf997cfae7627c5a9072147a831129.tar.gz | |
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
| -rw-r--r-- | libavcodec/h264.c | 14 | ||||
| -rw-r--r-- | libavcodec/h264data.h | 18 |
2 files changed, 18 insertions, 14 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ad23ae120a..704bc28b11 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -165,20 +165,6 @@ typedef struct H264Context{ MpegEncContext s; int nal_ref_idc; 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; unsigned int rbsp_buffer_size; diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index 2dea3580f7..a21db32db1 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -53,6 +53,24 @@ #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]={ {0, 1}, {1, 1}, |