Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2008 13:30:19 +0000 (13:30 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2008 13:30:19 +0000 (13:30 +0000)
Originally committed as revision 15534 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.h
libavcodec/h264data.h

index 1503b50..8f33233 100644 (file)
 #define ENABLE_H264_ENCODER 0
 #endif
 
+#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
+};
+
 /**
  * Sequence parameter set
  */
index 6ee8442..f01beeb 100644 (file)
 #include "mpegvideo.h"
 
 
-#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[17]={
  {0, 1},
  {1, 1},