[FFmpeg-cvslog] r15534 - in trunk/libavcodec: h264.h h264data.h

[michael]

Author: michael
Date: Fri Oct  3 15:30:19 2008
New Revision: 15534

Log:
Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.


Modified:
   trunk/libavcodec/h264.h
   trunk/libavcodec/h264data.h

Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h	(original)
+++ trunk/libavcodec/h264.h	Fri Oct  3 15:30:19 2008
@@ -84,6 +84,26 @@
 #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
  */

Modified: trunk/libavcodec/h264data.h
==============================================================================
--- trunk/libavcodec/h264data.h	(original)
+++ trunk/libavcodec/h264data.h	Fri Oct  3 15:30:19 2008
@@ -34,26 +34,6 @@
 #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},