virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

h264: remove H264Context.pict_type

Browse Source 
It is not used for anything internally, just exported in the output
frames. So remove the indirection and set it directly in frame_start().
This commit is contained in:
Anton Khirnov 2016-04-11 16:32:02 +02:00
parent 56087ec0a2
commit 370ddc7b38
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -438,8 +438,6 @@ static void decode_postinit(H264Context *h, int setup_finished)
int i, pics, out_of_order, out_idx; int i, pics, out_of_order, out_idx;
int invalid = 0, cnt = 0; int invalid = 0, cnt = 0;
h->cur_pic_ptr->f->pict_type = h->pict_type;
if (h->next_output_pic) if (h->next_output_pic)
return; return;

2
libavcodec/h264.h
View File

@ -597,8 +597,6 @@ typedef struct H264Context {
*/ */
int single_decode_warning; int single_decode_warning;
enum AVPictureType pict_type;
/** @} */ /** @} */
/** /**

6
libavcodec/h264_slice.c
View File

@ -467,6 +467,8 @@ static int h264_frame_start(H264Context *h)
pic->mmco_reset = 0; pic->mmco_reset = 0;
pic->recovered = 0; pic->recovered = 0;
pic->f->pict_type = h->slice_ctx[0].slice_type;
if (CONFIG_ERROR_RESILIENCE && h->enable_er) if (CONFIG_ERROR_RESILIENCE && h->enable_er)
ff_er_frame_start(&h->slice_ctx[0].er); ff_er_frame_start(&h->slice_ctx[0].er);
@ -974,10 +976,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
// to make a few old functions happy, it's wrong though
if (!h->setup_finished)
h->pict_type = sl->slice_type;
pps_id = get_ue_golomb(&sl->gb); pps_id = get_ue_golomb(&sl->gb);
if (pps_id >= MAX_PPS_COUNT) { if (pps_id >= MAX_PPS_COUNT) {
av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id); av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id);