diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:00:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:00:34 +0100 |
| commit | 830e548b9ec32ad7ab02be056db15cbcf3c58346 (patch) | |
| tree | 03ce45e4c52217252ae2fb8f960d75cd4f23d51c /libavcodec/h264.h | |
| parent | 44309dd29466bf2d9d9fa26ab6e73e7e64989c75 (diff) | |
| parent | 582683b6ac798ed2a004a4e2121b7bd47892bbfd (diff) | |
| download | ffmpeg-830e548b9ec32ad7ab02be056db15cbcf3c58346.tar.gz | |
Merge commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd'
* commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd':
h264: move remaining ER stuff into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index f1fbbe4e91..5793f0e471 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -336,6 +336,7 @@ typedef struct H264Picture { typedef struct H264SliceContext { struct H264Context *h264; GetBitContext gb; + ERContext er; int slice_num; int slice_type; @@ -435,6 +436,7 @@ typedef struct H264SliceContext { int ref2frm[MAX_SLICES][2][64]; ///< reference to frame number lists, used in the loop filter, the first 2 are for -2,-1 const uint8_t *intra_pcm_ptr; + int16_t *dc_val_base; uint8_t *bipred_scratchpad; uint8_t *edge_emu_buffer; @@ -487,7 +489,6 @@ typedef struct H264Context { H264ChromaContext h264chroma; H264QpelContext h264qpel; GetBitContext gb; - ERContext er; H264Picture *DPB; H264Picture *cur_pic_ptr; @@ -774,7 +775,6 @@ typedef struct H264Context { uint8_t parse_history[6]; int parse_history_count; int parse_last_mb; - int16_t *dc_val_base; AVBufferPool *qscale_table_pool; AVBufferPool *mb_type_pool; @@ -1161,7 +1161,7 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup); int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src); void ff_h264_unref_picture(H264Context *h, H264Picture *pic); -int ff_h264_context_init(H264Context *h); +int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl); int ff_h264_set_parameter_from_sps(H264Context *h); void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, int y, int height); |