diff options
author | James Almer <jamrial@gmail.com> | 2016-08-01 12:58:09 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2016-08-01 12:58:09 -0300 |
commit | 8c7932884d09bc580036640453fd6b7ad4dd77b4 (patch) | |
tree | b88fefc3f633d5fc4f8064ff9aa438e03ce32b3b /libavcodec/h264_ps.c | |
parent | 77b0f3f26d33d4f46f274896e0583ad1f5936b7c (diff) | |
parent | f638b67e5790735f34620bf82025c9b9d6fc7216 (diff) |
Merge commit 'f638b67e5790735f34620bf82025c9b9d6fc7216'
* commit 'f638b67e5790735f34620bf82025c9b9d6fc7216':
h264: move the parameter set definitions to a new header file
Conflicts:
libavcodec/h264_parse.h
libavcodec/h264_ps.c
libavcodec/h264dec.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_ps.c')
-rw-r--r-- | libavcodec/h264_ps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 8bc8f1fd9b..f288ca2a4f 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -31,13 +31,15 @@ #include "internal.h" #include "mathops.h" #include "avcodec.h" -#include "h264dec.h" #include "h264data.h" +#include "h264_ps.h" #include "golomb.h" #define MAX_LOG2_MAX_FRAME_NUM (12 + 4) #define MIN_LOG2_MAX_FRAME_NUM 4 +#define EXTENDED_SAR 255 + static const uint8_t default_scaling4[2][16] = { { 6, 13, 20, 28, 13, 20, 28, 32, 20, 28, 32, 37, 28, 32, 37, 42 }, |