diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 15:22:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 15:33:46 +0200 |
| commit | 07a79cf8694ac685ae8f579ccc33d113eb46fe3d (patch) | |
| tree | 75920179e81a146478832713c24a5208fde4d81d /libavcodec/h264.h | |
| parent | 4a95cd5d9b4b5a48e438827c9c8f048d86abc14c (diff) | |
| parent | 7a4f74eed51f914e9bbfebaffd4a92ac6791f819 (diff) | |
| download | ffmpeg-07a79cf8694ac685ae8f579ccc33d113eb46fe3d.tar.gz | |
Merge commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819'
* commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819':
h264: embed the DPB in the context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 12e5245c19..7ab1fdfda1 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -506,7 +506,7 @@ typedef struct H264Context { H264QpelContext h264qpel; GetBitContext gb; - H264Picture *DPB; + H264Picture DPB[H264_MAX_PICTURE_COUNT]; H264Picture *cur_pic_ptr; H264Picture cur_pic; H264Picture last_pic_for_ec; |