Originally committed as revision 15534 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -84,6 +84,26 @@ | |||||
#define ENABLE_H264_ENCODER 0 | #define ENABLE_H264_ENCODER 0 | ||||
#endif | #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 | * Sequence parameter set | ||||
*/ | */ | ||||
@@ -34,26 +34,6 @@ | |||||
#include "mpegvideo.h" | #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]={ | static const AVRational pixel_aspect[17]={ | ||||
{0, 1}, | {0, 1}, | ||||
{1, 1}, | {1, 1}, | ||||