diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:41:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:41:17 +0100 |
| commit | 0f8bb0efc3cf9e2b86c7e518f24133ea358566d5 (patch) | |
| tree | dacb1546d0e82b1f27766c419b5dfddc877b42a5 /libavcodec/h264_parser.c | |
| parent | 8bdcec31116594b07e83a8845b64a5e8172884f2 (diff) | |
| parent | 5bf3c0fa49afd5bbf43aa841ff78007d72c80736 (diff) | |
Merge commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736'
* commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736':
h264: drop the now unused per-slice H264Contexts
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index f4b97e6761..516c68fcd9 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -612,7 +612,6 @@ static av_cold int init(AVCodecParserContext *s) return 0; h->nb_slice_ctx = 1; - h->thread_context[0] = h; h->slice_context_count = 1; ff_h264dsp_init(&h->h264dsp, 8, 1); return 0; |