Mercurial > libavcodec.hg
changeset 7988:a7dfe657968d libavcodec
Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.
author | michael |
---|---|
date | Fri, 03 Oct 2008 13:30:19 +0000 |
parents | bf12bb0efb68 |
children | 0607ff0877ff |
files | h264.h h264data.h |
diffstat | 2 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.h Thu Oct 02 21:17:33 2008 +0000 +++ b/h264.h Fri Oct 03 13:30:19 2008 +0000 @@ -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 */
--- a/h264data.h Thu Oct 02 21:17:33 2008 +0000 +++ b/h264data.h Fri Oct 03 13:30:19 2008 +0000 @@ -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},