diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-05-07 10:31:13 +0200 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:13:44 +0100 |
| commit | 772ad7142dff590c7bb30370acf5d3c9a8fb512b (patch) | |
| tree | b0ea5c118dc93a404728bbb62ce12c9591ceb87a /libavcodec/h264.h | |
| parent | 9cc1ab63ac0fa524ad9b6c8ef600dc4fc69e2b31 (diff) | |
| parent | ca2f19b9cc37be509d85f05c8f902860475905f8 (diff) | |
| download | ffmpeg-772ad7142dff590c7bb30370acf5d3c9a8fb512b.tar.gz | |
Merge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'
* commit 'ca2f19b9cc37be509d85f05c8f902860475905f8':
h264: switch to h2645_parse for NAL parsing
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 5bf6b70ccc..33a73ba50c 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -34,6 +34,7 @@ #include "error_resilience.h" #include "get_bits.h" #include "h264_parse.h" +#include "h2645_parse.h" #include "h264chroma.h" #include "h264dsp.h" #include "h264pred.h" @@ -527,6 +528,8 @@ typedef struct H264Context { H264SliceContext *slice_ctx; int nb_slice_ctx; + H2645Packet pkt; + int pixel_shift; ///< 0 for 8-bit H264, 1 for high-bit-depth H264 /* coded dimensions -- 16 * mb w/h */ |