Mercurial > libavcodec.hg

changeset 4267:6f839bb47457 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change NAL unit type defines to an enum and move to a header file for usage in other code.
author takis
date Tue, 05 Dec 2006 21:52:15 +0000
parents 8a50de4eafca
children 3a4d4be05618
files h264.c h264data.h
diffstat 2 files changed, 18 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Tue Dec 05 12:35:47 2006 +0000
+++ b/h264.c	Tue Dec 05 21:52:15 2006 +0000
@@ -165,20 +165,6 @@
     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;
 
--- a/h264data.h	Tue Dec 05 12:35:47 2006 +0000
+++ b/h264data.h	Tue Dec 05 21:52:15 2006 +0000
@@ -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},