diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-10-03 13:30:19 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-10-03 13:30:19 +0000 |
| commit | 44ee6135e2241fe2b906e347d9a9889a224e3ec4 (patch) | |
| tree | 2197eda3f0491f9783fd6d34551f24a244e296b4 | |
| parent | bc5c918ea8757514de0ec0327066251a2f1ec23f (diff) | |
| download | ffmpeg-44ee6135e2241fe2b906e347d9a9889a224e3ec4.tar.gz | |
Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.
Originally committed as revision 15534 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.h | 20 | ||||
| -rw-r--r-- | libavcodec/h264data.h | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 1503b50d38..8f33233d83 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -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 */ diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index 6ee8442829..f01beeb3b1 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -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}, |