diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-04-06 20:33:58 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-04-29 05:52:57 +0200 |
| commit | ee62b364be0c30cba83b5ff10a3ca8c3e866ade6 (patch) | |
| tree | dbffed438d55e49d723eed17ae3a0b236bfdc03c /libavcodec/h264.h | |
| parent | 54986d6db9116ef9704b1ce8414ffdb7f1ca127f (diff) | |
| download | ffmpeg-ee62b364be0c30cba83b5ff10a3ca8c3e866ade6.tar.gz | |
h264: eliminate ff_h264_set_parameter_from_sps()
That function currently does two things -- reinitializing the DSP
contexts and setting low_delay based on the SPS values.
The former more appropriately belongs in h264_slice_header_init(), while
the latter only really makes sense in decode_slice_header().
The third call to ff_h264_set_parameter_from_sps(), done immediately
after parsing a new SPS, appears to serve no useful purpose, so it is
just dropped.
Also, drop now unneeded H264Context.cur_chroma_format_idc.
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 821b609b7f..9ca4edac3d 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -724,8 +724,6 @@ typedef struct H264Context { int sei_buffering_period_present; ///< Buffering period SEI flag int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs - int cur_chroma_format_idc; - int enable_er; AVBufferPool *qscale_table_pool; @@ -1073,7 +1071,6 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src); void ff_h264_unref_picture(H264Context *h, H264Picture *pic); 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); int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); |