diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-06-09 16:32:12 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-07-15 15:33:28 +0200 |
| commit | f450cc7bc595155bacdb9f5d2414a076ccf81b4a (patch) | |
| tree | 23d9b97080c346b2a830179a2fb83fd8cfb300c9 /libavcodec/h264dec.h | |
| parent | 8d07e941b04d63fc4443dd986e3dc7b69cdcca43 (diff) | |
| download | ffmpeg-f450cc7bc595155bacdb9f5d2414a076ccf81b4a.tar.gz | |
h264: eliminate decode_postinit()
This function's purpose is not very well defined. Currently it does two
(only marginally related) things: selecting the next output frame and
calling ff_thread_finish_setup() for frame threading. The first of those
more properly belongs under field_start(), while the second can be
called directly from decode_nal_units().
Diffstat (limited to 'libavcodec/h264dec.h')
| -rw-r--r-- | libavcodec/h264dec.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 6f3c4379e8..6f5ab41f52 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -449,7 +449,6 @@ typedef struct H264Context { H264Picture *long_ref[32]; H264Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size? int last_pocs[MAX_DELAYED_PIC_COUNT]; - H264Picture *next_output_pic; int next_outputed_poc; /** @@ -509,6 +508,8 @@ typedef struct H264Context { * slices) anymore */ int setup_finished; + AVFrame *output_frame; + int enable_er; H264SEIContext sei; |