diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 16:29:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 16:29:07 +0100 |
| commit | 857d7194ca6d07fb9fa70c05826895d6b9c5e983 (patch) | |
| tree | e8c39b4af492a32e1f3e0cfe71d70c47a7371a31 /libavcodec/h264.h | |
| parent | 6777aa638791d9a95efc5f7cddba7103fbb309b1 (diff) | |
| parent | a394959bbee9e41ff121488f251f85e8a8fb3384 (diff) | |
| download | ffmpeg-857d7194ca6d07fb9fa70c05826895d6b9c5e983.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: add a pointer for weighted prediction temporary buffer
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 00a1fc3c5d..4e44fba163 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -595,6 +595,7 @@ typedef struct H264Context { int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs int cur_chroma_format_idc; + uint8_t *bipred_scratchpad; int16_t slice_row[MAX_SLICES]; ///< to detect when MAX_SLICES is too low |